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

Jacek Caban : kernel32/tests: Add console title tests.
by Alexandre Julliard 12 Aug '20

12 Aug '20

Module: wine Branch: master Commit: cd8971399e35a8feaa841025ab74857a85bf5678 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd8971399e35a8feaa841025… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 12 15:10:45 2020 +0200 kernel32/tests: Add console title tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5e7754d648..2facdf91fa 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3679,6 +3679,30 @@ static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) CloseHandle(std_input); } +static void test_console_title(void) +{ + WCHAR buf[64]; + BOOL ret; + + ret = SetConsoleTitleW(L"test"); + ok(ret, "SetConsoleTitleW failed: %u\n", GetLastError()); + + ret = GetConsoleTitleW(buf, ARRAY_SIZE(buf)); + ok(ret, "GetConsoleTitleW failed: %u\n", GetLastError()); + ok(!wcscmp(buf, L"test"), "title = %s\n", wine_dbgstr_w(buf)); + + if (!skip_nt) + { + ret = GetConsoleTitleW(buf, 2); + ok(ret, "GetConsoleTitleW failed: %u\n", GetLastError()); + ok(!wcscmp(buf, L"t"), "title = %s\n", wine_dbgstr_w(buf)); + + ret = GetConsoleTitleW(buf, 4); + ok(ret, "GetConsoleTitleW failed: %u\n", GetLastError()); + ok(!wcscmp(buf, L"tes"), "title = %s\n", wine_dbgstr_w(buf)); + } +} + static void test_AttachConsole_child(DWORD console_pid) { HANDLE pipe_in, pipe_out; @@ -4046,6 +4070,7 @@ START_TEST(console) test_SetConsoleFont(hConOut); test_GetConsoleScreenBufferInfoEx(hConOut); test_SetConsoleScreenBufferInfoEx(hConOut); + test_console_title(); if (!test_current) { test_AttachConsole(hConOut);

1 0

Zebediah Figura : vkd3d-shader: Rename vkd3d_sm4_immconst_type to vkd3d_sm4_dimension.
by Alexandre Julliard 12 Aug '20

12 Aug '20

Module: vkd3d Branch: master Commit: 90eb138f22784313c8915e7beeb8b9e5bf457e75 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=90eb138f22784313c8915e7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 11 16:05:17 2020 -0500 vkd3d-shader: Rename vkd3d_sm4_immconst_type to vkd3d_sm4_dimension. These bits are used in all register tokens, not just immediate constants. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 81c1f48..89e3c0e 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -96,8 +96,8 @@ #define VKD3D_SM4_SWIZZLE_TYPE_SHIFT 2 #define VKD3D_SM4_SWIZZLE_TYPE_MASK (0x3u << VKD3D_SM4_SWIZZLE_TYPE_SHIFT) -#define VKD3D_SM4_IMMCONST_TYPE_SHIFT 0 -#define VKD3D_SM4_IMMCONST_TYPE_MASK (0x3u << VKD3D_SM4_IMMCONST_TYPE_SHIFT) +#define VKD3D_SM4_DIMENSION_SHIFT 0 +#define VKD3D_SM4_DIMENSION_MASK (0x3u << VKD3D_SM4_DIMENSION_SHIFT) #define VKD3D_SM4_WRITEMASK_SHIFT 4 #define VKD3D_SM4_WRITEMASK_MASK (0xfu << VKD3D_SM4_WRITEMASK_SHIFT) @@ -396,10 +396,11 @@ enum vkd3d_sm4_swizzle_type VKD3D_SM4_SWIZZLE_SCALAR = 0x2, }; -enum vkd3d_sm4_immconst_type +enum vkd3d_sm4_dimension { - VKD3D_SM4_IMMCONST_SCALAR = 0x1, - VKD3D_SM4_IMMCONST_VEC4 = 0x2, + VKD3D_SM4_DIMENSION_NONE = 0x0, + VKD3D_SM4_DIMENSION_SCALAR = 0x1, + VKD3D_SM4_DIMENSION_VEC4 = 0x2, }; enum vkd3d_sm4_resource_type @@ -1573,12 +1574,11 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr if (register_type == VKD3D_SM4_RT_IMMCONST) { - enum vkd3d_sm4_immconst_type immconst_type = - (token & VKD3D_SM4_IMMCONST_TYPE_MASK) >> VKD3D_SM4_IMMCONST_TYPE_SHIFT; + enum vkd3d_sm4_dimension dimension = (token & VKD3D_SM4_DIMENSION_MASK) >> VKD3D_SM4_DIMENSION_SHIFT; - switch (immconst_type) + switch (dimension) { - case VKD3D_SM4_IMMCONST_SCALAR: + case VKD3D_SM4_DIMENSION_SCALAR: param->immconst_type = VKD3D_IMMCONST_SCALAR; if (end - *ptr < 1) { @@ -1589,7 +1589,7 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr *ptr += 1; break; - case VKD3D_SM4_IMMCONST_VEC4: + case VKD3D_SM4_DIMENSION_VEC4: param->immconst_type = VKD3D_IMMCONST_VEC4; if (end - *ptr < VKD3D_VEC4_SIZE) { @@ -1601,7 +1601,7 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr break; default: - FIXME("Unhandled immediate constant type %#x.\n", immconst_type); + FIXME("Unhandled dimension %#x.\n", dimension); break; } }

1 0

Zebediah Figura : vkd3d-shader: Remove the unused "ctx" field from struct vkd3d_shader_instruction.
by Alexandre Julliard 12 Aug '20

12 Aug '20

Module: vkd3d Branch: master Commit: 3244fa3f920a31c65ff3235517e5cf1795ccc872 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3244fa3f920a31c65ff3235… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 11 16:24:36 2020 -0500 vkd3d-shader: Remove the unused "ctx" field from struct vkd3d_shader_instruction. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_private.h | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 21e37da..51e1dd6 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -756,7 +756,6 @@ struct vkd3d_shader_primitive_type struct vkd3d_shader_instruction { - const struct vkd3d_shader_context *ctx; enum VKD3D_SHADER_INSTRUCTION_HANDLER handler_idx; DWORD flags; unsigned int dst_count;

1 0

Stefan Dösinger : ddraw: Thunk to surface1, not surface7 in flip.
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: 6a276eba1693bb25190bfd8db34a143d69f0fc20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a276eba1693bb25190bfd8d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 11 14:50:44 2020 +0300 ddraw: Thunk to surface1, not surface7 in flip. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 62 +++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 83b2114176..fd788a96ac 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1270,16 +1270,18 @@ static unsigned int ddraw_swap_interval_from_flags(DWORD flags) } } -static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 *iface, - IDirectDrawSurface7 *src, DWORD flags) +/* FRAPS hooks IDirectDrawSurface::Flip and expects the version 1 method to be called when the + * game uses later interfaces. */ +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface *iface, + IDirectDrawSurface *src, DWORD flags) { - struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface7(iface); - struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface7(src); + struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface(iface); + struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface(src); struct ddraw_texture *dst_ddraw_texture, *src_ddraw_texture; struct wined3d_rendertarget_view *tmp_rtv, *src_rtv, *rtv; - DDSCAPS2 caps = {DDSCAPS_FLIP, 0, 0, {0}}; + DDSCAPS caps = {DDSCAPS_FLIP}; struct wined3d_texture *texture; - IDirectDrawSurface7 *current; + IDirectDrawSurface *current; void *texture_memory; HRESULT hr; @@ -1313,13 +1315,13 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 { for (current = iface; current != src;) { - if (FAILED(hr = ddraw_surface7_GetAttachedSurface(current, &caps, &current))) + if (FAILED(hr = ddraw_surface1_GetAttachedSurface(current, &caps, &current))) { WARN("Surface %p is not on the same flip chain as surface %p.\n", src, iface); wined3d_mutex_unlock(); return DDERR_NOTFLIPPABLE; } - ddraw_surface7_Release(current); + ddraw_surface1_Release(current); if (current == iface) { WARN("Surface %p is not on the same flip chain as surface %p.\n", src, iface); @@ -1346,20 +1348,20 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 { for (current = iface;;) { - if (FAILED(hr = ddraw_surface7_GetAttachedSurface(current, &caps, &current))) + if (FAILED(hr = ddraw_surface1_GetAttachedSurface(current, &caps, &current))) { ERR("Can't find a flip target\n"); wined3d_mutex_unlock(); return DDERR_NOTFLIPPABLE; /* Unchecked */ } - ddraw_surface7_Release(current); + ddraw_surface1_Release(current); if (current == iface) { - dst_impl = impl_from_IDirectDrawSurface7(iface); + dst_impl = impl_from_IDirectDrawSurface(iface); break; } - src_impl = impl_from_IDirectDrawSurface7(current); + src_impl = impl_from_IDirectDrawSurface(current); src_rtv = ddraw_surface_get_rendertarget_view(src_impl); if (rtv == dst_impl->wined3d_rtv) wined3d_device_set_rendertarget_view(dst_impl->ddraw->wined3d_device, 0, src_rtv, FALSE); @@ -1407,6 +1409,18 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 return hr; } +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 *iface, + IDirectDrawSurface7 *src, DWORD flags) +{ + struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); + struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface7(src); + + TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); + + return ddraw_surface1_Flip(&surface->IDirectDrawSurface_iface, + src_impl ? &src_impl->IDirectDrawSurface_iface : NULL, flags); +} + static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Flip(IDirectDrawSurface4 *iface, IDirectDrawSurface4 *src, DWORD flags) { @@ -1415,8 +1429,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Flip(IDirectDrawSurface4 TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); - return ddraw_surface7_Flip(&surface->IDirectDrawSurface7_iface, - src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, flags); + return ddraw_surface1_Flip(&surface->IDirectDrawSurface_iface, + src_impl ? &src_impl->IDirectDrawSurface_iface : NULL, flags); } static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Flip(IDirectDrawSurface3 *iface, @@ -1427,8 +1441,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Flip(IDirectDrawSurface3 TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); - return ddraw_surface7_Flip(&surface->IDirectDrawSurface7_iface, - src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, flags); + return ddraw_surface1_Flip(&surface->IDirectDrawSurface_iface, + src_impl ? &src_impl->IDirectDrawSurface_iface : NULL, flags); } static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Flip(IDirectDrawSurface2 *iface, @@ -1439,20 +1453,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Flip(IDirectDrawSurface2 TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); - return ddraw_surface7_Flip(&surface->IDirectDrawSurface7_iface, - src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, flags); -} - -static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface *iface, - IDirectDrawSurface *src, DWORD flags) -{ - struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface); - struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface(src); - - TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); - - return ddraw_surface7_Flip(&surface->IDirectDrawSurface7_iface, - src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, flags); + return ddraw_surface1_Flip(&surface->IDirectDrawSurface_iface, + src_impl ? &src_impl->IDirectDrawSurface_iface : NULL, flags); } static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT *dst_rect,

1 0

Hans Leidekker : ws2_32: Avoid a crash in WS_getaddrinfo when the specified service doesn't exist.
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: a6d9f46b25a481648a2a06ed8d1594fc59a4e313 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6d9f46b25a481648a2a06ed… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 11 14:11:05 2020 +0200 ws2_32: Avoid a crash in WS_getaddrinfo when the specified service doesn't exist. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49656 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index eb21e4b4b3..4d2afa946b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6787,7 +6787,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr result = getaddrinfo(node, servname, punixhints, &unixaires); if (result && (!hints || !(hints->ai_flags & WS_AI_NUMERICHOST)) - && (!strcmp(fqdn, node) || (!strncmp(fqdn, node, hostname_len) && !node[hostname_len]))) + && node && (!strcmp(fqdn, node) || (!strncmp(fqdn, node, hostname_len) && !node[hostname_len]))) { /* If it didn't work it means the host name IP is not in /etc/hosts, try again * by sending a NULL host and avoid sending a NULL servname too because that diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b7a3fc4453..b523c326d6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7778,6 +7778,10 @@ static void test_getaddrinfo(void) ok(0, "test %d: getaddrinfo failed with %d (err %d)\n", i, ret, err); } } + + memset(&hint, 0, sizeof(hint)); + ret = pgetaddrinfo(NULL, "nonexistentservice", &hint, &result); + ok(ret == WSATYPE_NOT_FOUND, "got %d\n", ret); } static void test_ConnectEx(void)

1 0

Fabian Maurer : wine.inf: Map the Intl section of win.ini to the registry.
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: f3a38b88d66b27954b3cf4ced6af923a9ada7ba9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3a38b88d66b27954b3cf4ce… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Aug 10 23:47:53 2020 +0200 wine.inf: Map the Intl section of win.ini to the registry. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49653 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 35992a01df..8777377002 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -568,6 +568,7 @@ HKLM,%CurrentVersionNT%\Image File Execution Options,,16 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"desktop",,"USR:Control Panel\Desktop" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"devices",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Devices" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"extensions",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Extensions" +HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"intl",,"USR:Control Panel\International" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"printerports",,"USR:Software\Microsoft\Windows NT\CurrentVersion\PrinterPorts" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"sounds",,"USR:Control Panel\Sounds" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,,,"USR:Software\Microsoft\Windows NT\CurrentVersion\Windows"

1 0

Gabriel Ivăncescu : msscript.ocx: Add IScriptProcedureCollection stub implementation.
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: f40270719bbdb33e0a2221f23e587a6c56a995e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f40270719bbdb33e0a2221f2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 10 17:57:56 2020 +0300 msscript.ocx: Add IScriptProcedureCollection stub implementation. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 203 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 195 insertions(+), 8 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 3fc4aca2e9..e98601438c 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -51,6 +51,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msscript); struct ScriptControl; typedef struct ConnectionPoint ConnectionPoint; +typedef struct ScriptProcedureCollection ScriptProcedureCollection; typedef struct ScriptHost ScriptHost; struct ConnectionPoint { @@ -82,8 +83,17 @@ typedef struct { BSTR name; ScriptHost *host; IDispatch *script_dispatch; + + ScriptProcedureCollection *procedures; } ScriptModule; +struct ScriptProcedureCollection { + IScriptProcedureCollection IScriptProcedureCollection_iface; + LONG ref; + + ScriptModule *module; +}; + struct ScriptHost { IActiveScriptSite IActiveScriptSite_iface; IActiveScriptSiteWindow IActiveScriptSiteWindow_iface; @@ -137,6 +147,7 @@ typedef enum tid_t { IScriptControl_tid, IScriptModuleCollection_tid, IScriptModule_tid, + IScriptProcedureCollection_tid, LAST_tid } tid_t; @@ -146,7 +157,8 @@ static ITypeInfo *typeinfos[LAST_tid]; static REFIID tid_ids[] = { &IID_IScriptControl, &IID_IScriptModuleCollection, - &IID_IScriptModule + &IID_IScriptModule, + &IID_IScriptProcedureCollection, }; static HRESULT load_typelib(void) @@ -404,6 +416,11 @@ static inline ScriptControl *impl_from_IConnectionPointContainer(IConnectionPoin return CONTAINING_RECORD(iface, ScriptControl, IConnectionPointContainer_iface); } +static inline ScriptProcedureCollection *impl_from_IScriptProcedureCollection(IScriptProcedureCollection *iface) +{ + return CONTAINING_RECORD(iface, ScriptProcedureCollection, IScriptProcedureCollection_iface); +} + static inline ScriptControl *impl_from_IScriptModuleCollection(IScriptModuleCollection *iface) { return CONTAINING_RECORD(iface, ScriptControl, IScriptModuleCollection_iface); @@ -674,6 +691,154 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { ServiceProvider_QueryService }; +static HRESULT WINAPI ScriptProcedureCollection_QueryInterface(IScriptProcedureCollection *iface, REFIID riid, void **ppv) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + + if (IsEqualGUID(&IID_IDispatch, riid) || IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IScriptProcedureCollection, riid)) + { + *ppv = &This->IScriptProcedureCollection_iface; + } + else + { + WARN("unsupported interface: (%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ScriptProcedureCollection_AddRef(IScriptProcedureCollection *iface) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI ScriptProcedureCollection_Release(IScriptProcedureCollection *iface) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) + { + This->module->procedures = NULL; + IScriptModule_Release(&This->module->IScriptModule_iface); + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI ScriptProcedureCollection_GetTypeInfoCount(IScriptProcedureCollection *iface, UINT *pctinfo) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI ScriptProcedureCollection_GetTypeInfo(IScriptProcedureCollection *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + return get_typeinfo(IScriptProcedureCollection_tid, ppTInfo); +} + +static HRESULT WINAPI ScriptProcedureCollection_GetIDsOfNames(IScriptProcedureCollection *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IScriptProcedureCollection_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI ScriptProcedureCollection_Invoke(IScriptProcedureCollection *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IScriptProcedureCollection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI ScriptProcedureCollection_get__NewEnum(IScriptProcedureCollection *iface, IUnknown **ppenumProcedures) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + + FIXME("(%p)->(%p)\n", This, ppenumProcedures); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptProcedureCollection_get_Item(IScriptProcedureCollection *iface, VARIANT index, + IScriptProcedure **ppdispProcedure) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + + FIXME("(%p)->(%s %p)\n", This, wine_dbgstr_variant(&index), ppdispProcedure); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptProcedureCollection_get_Count(IScriptProcedureCollection *iface, LONG *plCount) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + + FIXME("(%p)->(%p)\n", This, plCount); + + return E_NOTIMPL; +} + +static const IScriptProcedureCollectionVtbl ScriptProcedureCollectionVtbl = { + ScriptProcedureCollection_QueryInterface, + ScriptProcedureCollection_AddRef, + ScriptProcedureCollection_Release, + ScriptProcedureCollection_GetTypeInfoCount, + ScriptProcedureCollection_GetTypeInfo, + ScriptProcedureCollection_GetIDsOfNames, + ScriptProcedureCollection_Invoke, + ScriptProcedureCollection_get__NewEnum, + ScriptProcedureCollection_get_Item, + ScriptProcedureCollection_get_Count +}; + static void detach_script_host(ScriptHost *host) { if (--host->module_count) @@ -848,9 +1013,29 @@ static HRESULT WINAPI ScriptModule_get_Procedures(IScriptModule *iface, IScriptP { ScriptModule *This = impl_from_IScriptModule(iface); - FIXME("(%p)->(%p)\n", This, ppdispProcedures); + TRACE("(%p)->(%p)\n", This, ppdispProcedures); - return E_NOTIMPL; + if (!This->host) + return E_FAIL; + + if (This->procedures) + IScriptProcedureCollection_AddRef(&This->procedures->IScriptProcedureCollection_iface); + else + { + ScriptProcedureCollection *procs; + + if (!(procs = heap_alloc(sizeof(*procs)))) + return E_OUTOFMEMORY; + + procs->IScriptProcedureCollection_iface.lpVtbl = &ScriptProcedureCollectionVtbl; + procs->ref = 1; + procs->module = This; + This->procedures = procs; + IScriptModule_AddRef(&This->IScriptModule_iface); + } + + *ppdispProcedures = &This->procedures->IScriptProcedureCollection_iface; + return S_OK; } static HRESULT WINAPI ScriptModule_AddCode(IScriptModule *iface, BSTR code) @@ -1060,18 +1245,16 @@ static ScriptModule *create_module(ScriptHost *host, BSTR name) { ScriptModule *module; - if (!(module = heap_alloc(sizeof(*module)))) return NULL; + if (!(module = heap_alloc_zero(sizeof(*module)))) return NULL; module->IScriptModule_iface.lpVtbl = &ScriptModuleVtbl; module->ref = 1; - module->name = NULL; if (name && !(module->name = SysAllocString(name))) { heap_free(module); return NULL; } module->host = host; - module->script_dispatch = NULL; IActiveScriptSite_AddRef(&host->IActiveScriptSite_iface); return module; } @@ -1771,8 +1954,12 @@ static HRESULT WINAPI ScriptControl_get_CodeObject(IScriptControl *iface, IDispa static HRESULT WINAPI ScriptControl_get_Procedures(IScriptControl *iface, IScriptProcedureCollection **p) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if (!This->host) return E_FAIL; + + return IScriptModule_get_Procedures(&This->modules[0]->IScriptModule_iface, p); } static HRESULT WINAPI ScriptControl__AboutBox(IScriptControl *iface)

1 0

Brendan Shanks : ntdll: Pad HEAP structure so 'flags' offset matches recent Windows.
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: fd80e0300cbec55fe637714d3b02128616cdd570 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd80e0300cbec55fe637714d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Aug 7 11:40:52 2020 -0700 ntdll: Pad HEAP structure so 'flags' offset matches recent Windows. Needed for Red Dead Redemption 2 to pass anti-debugger checks, it accesses 'flags' and 'force_flags' at a fixed offset of the ProcessHeap. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49666 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index f3c76cc82b..1ac0cb2480 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -145,7 +145,13 @@ typedef struct tagSUBHEAP typedef struct tagHEAP { DWORD_PTR unknown1[2]; - DWORD unknown2; + DWORD unknown2[2]; + DWORD_PTR unknown3[4]; + DWORD unknown4; + DWORD_PTR unknown5[2]; + DWORD unknown6[3]; + DWORD_PTR unknown7[2]; + /* For Vista through 10, 'flags' is at offset 0x40 (x86) / 0x70 (x64) */ DWORD flags; /* Heap flags */ DWORD force_flags; /* Forced heap flags for debugging */ SUBHEAP subheap; /* First sub-heap */

1 0

Vijay Kiran Kamuju : include: Add missing WAVEBANKENTRY_FLAGS to xact3wb.h.
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: f810a1ee8b95fe9aa01300ff0146188b6f79d351 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f810a1ee8b95fe9aa01300ff… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Aug 10 18:14:51 2020 +0200 include: Add missing WAVEBANKENTRY_FLAGS to xact3wb.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/xact3wb.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/xact3wb.h b/include/xact3wb.h index 81b1518930..6d157a466f 100644 --- a/include/xact3wb.h +++ b/include/xact3wb.h @@ -105,6 +105,12 @@ typedef const WAVEBANKHEADER *LPCWAVEBANKHEADER; #define WAVEBANKENTRY_XMASTREAMS_MAX 3 #define WAVEBANKENTRY_XMACHANNELS_MAX 6 +#define WAVEBANKENTRY_FLAGS_READAHEAD 0x00000001 +#define WAVEBANKENTRY_FLAGS_LOOPCACHE 0x00000002 +#define WAVEBANKENTRY_FLAGS_REMOVELOOPTAIL 0x00000004 +#define WAVEBANKENTRY_FLAGS_IGNORELOOP 0x00000008 +#define WAVEBANKENTRY_FLAGS_MASK 0x00000008 + typedef struct WAVEBANKENTRY { union

1 0

Vijay Kiran Kamuju : include: Fix the spelling of XACT_WAVE_STREAMING_PARAMETERS in xact3.h.
by Alexandre Julliard 11 Aug '20

11 Aug '20

Module: wine Branch: master Commit: 369723014c93c6d14c5415d7a5c9627f9dc8975e URL: https://source.winehq.org/git/wine.git/?a=commit;h=369723014c93c6d14c5415d7… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Aug 11 10:43:02 2020 +0200 include: Fix the spelling of XACT_WAVE_STREAMING_PARAMETERS in xact3.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 2 +- include/xact3.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 0ac0d914b3..c5f96decb7 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -912,7 +912,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateInMemoryWaveBank(IXACT3Engine *ifac } static HRESULT WINAPI IXACT3EngineImpl_CreateStreamingWaveBank(IXACT3Engine *iface, - const XACT_STREAMING_PARAMETERS *pParms, + const XACT_WAVEBANK_STREAMING_PARAMETERS *pParms, IXACT3WaveBank **ppWaveBank) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); diff --git a/include/xact3.h b/include/xact3.h index 2b4f0e07f3..63eec70736 100644 --- a/include/xact3.h +++ b/include/xact3.h @@ -225,9 +225,9 @@ typedef struct XACT_STREAMING_PARAMETERS DWORD offset; DWORD flags; WORD packetSize; -} XACT_STREAMING_PARAMETERS, *LPXACT_STREAMING_PARAMETERS, XACT_WAVE_STREAMING_PARAMETERS, *LPXACT_WAVE_STREAMING_PARAMETERS; +} XACT_STREAMING_PARAMETERS, *LPXACT_STREAMING_PARAMETERS, XACT_WAVEBANK_STREAMING_PARAMETERS, *LPXACT_WAVEBANK_STREAMING_PARAMETERS; typedef const XACT_STREAMING_PARAMETERS *LPCXACT_STREAMING_PARAMETERS; -typedef const XACT_WAVE_STREAMING_PARAMETERS *LPCXACT_WAVE_STREAMING_PARAMETERS; +typedef const XACT_WAVEBANK_STREAMING_PARAMETERS *LPCXACT_WAVEBANK_STREAMING_PARAMETERS; typedef struct XACT_CUE_PROPERTIES { @@ -674,7 +674,7 @@ DECLARE_INTERFACE_(IXACT3Engine,IUnknown) STDMETHOD(DoWork)(THIS) PURE; STDMETHOD(CreateSoundBank)(THIS_ const void *pvBuffer, DWORD dwSize, DWORD dwFlags, DWORD dwAllocAttributes, IXACT3SoundBank **ppSoundBank) PURE; STDMETHOD(CreateInMemoryWaveBank)(THIS_ const void *pvBuffer, DWORD dwSize, DWORD dwFlags, DWORD dwAllocAttributes, IXACT3WaveBank **ppWaveBank) PURE; - STDMETHOD(CreateStreamingWaveBank)(THIS_ const XACT_WAVE_STREAMING_PARAMETERS *pParams, IXACT3WaveBank **ppWaveBank) PURE; + STDMETHOD(CreateStreamingWaveBank)(THIS_ const XACT_WAVEBANK_STREAMING_PARAMETERS *pParams, IXACT3WaveBank **ppWaveBank) PURE; STDMETHOD(PrepareWave)(THIS_ DWORD dwFlags, PCSTR szWavePath, WORD wStreamingPacketSize, DWORD dwAlignment, DWORD dwPlayOffset, XACTLOOPCOUNT nLoopCount, IXACT3Wave **ppWave) PURE; STDMETHOD(PrepareInMemoryWave)(THIS_ DWORD dwFlags, WAVEBANKENTRY entry, DWORD *pdwSeekTable, BYTE *pbWaveData,

1 0