February 2018 - Wine-devel - list.winehq.org

[PATCH 1/3] msvfw32: Fix driver enumeration.
by Zebediah Figura 09 Feb '18

09 Feb '18

This behaviour matches that on Windows tested mainly by manually modifying the registry. If this is appropriate for a test I will add one. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msvfw32/msvideo_main.c | 53 ++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index d49ea74..3c9e098 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -223,48 +223,48 @@ static int compare_fourcc(DWORD fcc1, DWORD fcc2) return strncasecmp(fcc_str1, fcc_str2, 4); } -typedef BOOL (*enum_handler_t)(const char*, unsigned int, void*); +typedef BOOL (*enum_handler_t)(const char *name, const char *driver, unsigned int index, void *param); static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param) { - CHAR buf[2048], fccTypeStr[5], *s; + char fccTypeStr[4]; + char name_buf[10]; + char buf[2048]; + DWORD i, cnt = 0, lRet; BOOL result = FALSE; HKEY hKey; fourcc_to_string(fccTypeStr, fccType); - fccTypeStr[4] = '.'; /* first, go through the registry entries */ lRet = RegOpenKeyExA(HKEY_LOCAL_MACHINE, HKLM_DRIVERS32, 0, KEY_QUERY_VALUE, &hKey); if (lRet == ERROR_SUCCESS) { - DWORD name, data, type; i = 0; for (;;) - { - name = 10; - data = sizeof buf - name; - lRet = RegEnumValueA(hKey, i++, buf, &name, 0, &type, (LPBYTE)(buf+name), &data); - if (lRet == ERROR_NO_MORE_ITEMS) break; - if (lRet != ERROR_SUCCESS) continue; - if (fccType && (name != 9 || strncasecmp(buf, fccTypeStr, 5))) continue; - buf[name] = '='; - if ((result = handler(buf, cnt++, param))) break; - } - RegCloseKey( hKey ); + { + DWORD name_len = 10, driver_len = 128; + lRet = RegEnumValueA(hKey, i++, name_buf, &name_len, 0, 0, (BYTE *)buf, &driver_len); + if (lRet == ERROR_NO_MORE_ITEMS) break; + if (name_len != 9 || name_buf[4] != '.') continue; + if (fccType && strncasecmp(name_buf, fccTypeStr, 4)) continue; + if ((result = handler(name_buf, buf, cnt++, param))) break; + } + RegCloseKey( hKey ); } if (result) return result; /* if that didn't work, go through the values in system.ini */ if (GetPrivateProfileSectionA("drivers32", buf, sizeof(buf), "system.ini")) { - for (s = buf; *s; s += strlen(s) + 1) - { - TRACE("got %s\n", s); - if (fccType && (strncasecmp(s, fccTypeStr, 5) || s[9] != '=')) continue; - if ((result = handler(s, cnt++, param))) break; - } + char *s; + for (s = buf; *s; s += strlen(s) + 1) + { + if (s[5] != '.' || s[9] != '=') continue; + if (fccType && strncasecmp(s, fccTypeStr, 4)) continue; + if ((result = handler(s, s + 10, cnt++, param))) break; + } } return result; @@ -294,21 +294,20 @@ DWORD WINAPI VideoForWindowsVersion(void) return 0x040003B6; /* 4.950 */ } -static BOOL ICInfo_enum_handler(const char *drv, unsigned int nr, void *param) +static BOOL ICInfo_enum_handler(const char *name, const char *driver, unsigned int nr, void *param) { ICINFO *lpicinfo = param; - DWORD fccHandler = mmioStringToFOURCCA(drv + 5, 0); + DWORD fccHandler = mmioStringToFOURCCA(name + 5, 0); if (lpicinfo->fccHandler != nr && compare_fourcc(lpicinfo->fccHandler, fccHandler)) return FALSE; - lpicinfo->fccHandler = fccHandler; lpicinfo->dwFlags = 0; lpicinfo->dwVersion = 0; lpicinfo->dwVersionICM = ICVERSION; lpicinfo->szName[0] = 0; lpicinfo->szDescription[0] = 0; - MultiByteToWideChar(CP_ACP, 0, drv + 10, -1, lpicinfo->szDriver, + MultiByteToWideChar(CP_ACP, 0, driver, -1, lpicinfo->szDriver, sizeof(lpicinfo->szDriver)/sizeof(WCHAR)); return TRUE; @@ -647,10 +646,10 @@ static HIC try_driver(driver_info_t *info) return 0; } -static BOOL ICLocate_enum_handler(const char *drv, unsigned int nr, void *param) +static BOOL ICLocate_enum_handler(const char *name, const char *driver, unsigned int nr, void *param) { driver_info_t *info = param; - info->fccHandler = mmioStringToFOURCCA(drv + 5, 0); + info->fccHandler = mmioStringToFOURCCA(name + 5, 0); info->hic = try_driver(info); return info->hic != 0; } -- 2.7.4

1 3

[PATCH] mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement in remove_child_attr.
by Jacek Caban 09 Feb '18

09 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/editor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 1

[PATCH] winebus.sys: Implement IRP_MN_QUERY_DEVICE_RELATIONS
by Aric Stewart 09 Feb '18

09 Feb '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/main.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+)

1 0

[PATCH 1/8] wined3d: Avoid guessing texture target if OpenGL 4.5 is available.
by Józef Kucia 09 Feb '18

09 Feb '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/context.c | 65 ++++++++++++++++++++++++++++++++++---------------- dlls/wined3d/directx.c | 2 ++ 2 files changed, 46 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ccfe630e1f25..9a69921b7a17 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -289,39 +289,62 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G unsigned int i; tex_type_str = NULL; - for (i = 0; i < ARRAY_SIZE(texture_type); ++i) + if (gl_info->gl_ops.ext.p_glGetTextureParameteriv) { - if (!gl_info->supported[texture_type[i].extension]) - continue; + GL_EXTCALL(glGetTextureParameteriv(name, GL_TEXTURE_TARGET, &tex_target)); - gl_info->gl_ops.gl.p_glGetIntegerv(texture_type[i].binding, &old_texture); - while (gl_info->gl_ops.gl.p_glGetError()); - - gl_info->gl_ops.gl.p_glBindTexture(texture_type[i].target, name); - if (!gl_info->gl_ops.gl.p_glGetError()) + for (i = 0; i < ARRAY_SIZE(texture_type); ++i) { - tex_target = texture_type[i].target; - tex_type_str = texture_type[i].str; - break; + if (texture_type[i].target == tex_target) + { + tex_type_str = texture_type[i].str; + break; + } } - gl_info->gl_ops.gl.p_glBindTexture(texture_type[i].target, old_texture); + if (i == ARRAY_SIZE(texture_type)) + tex_type_str = wine_dbg_sprintf("%#x", tex_target); + + GL_EXTCALL(glGetTextureLevelParameteriv(name, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt)); + GL_EXTCALL(glGetTextureLevelParameteriv(name, level, GL_TEXTURE_WIDTH, &width)); + GL_EXTCALL(glGetTextureLevelParameteriv(name, level, GL_TEXTURE_HEIGHT, &height)); } - if (!tex_type_str) + else { - FIXME("Cannot find type of texture %d.\n", name); - return; - } + for (i = 0; i < ARRAY_SIZE(texture_type); ++i) + { + if (!gl_info->supported[texture_type[i].extension]) + continue; + + gl_info->gl_ops.gl.p_glGetIntegerv(texture_type[i].binding, &old_texture); + while (gl_info->gl_ops.gl.p_glGetError()); - gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt); - gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_WIDTH, &width); - gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_HEIGHT, &height); + gl_info->gl_ops.gl.p_glBindTexture(texture_type[i].target, name); + if (!gl_info->gl_ops.gl.p_glGetError()) + { + tex_target = texture_type[i].target; + tex_type_str = texture_type[i].str; + break; + } + gl_info->gl_ops.gl.p_glBindTexture(texture_type[i].target, old_texture); + } + if (!tex_type_str) + { + FIXME("Cannot find type of texture %d.\n", name); + return; + } + + gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt); + gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_WIDTH, &width); + gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_HEIGHT, &height); + + gl_info->gl_ops.gl.p_glBindTexture(tex_target, old_texture); + } } FIXME(" %s: %s texture %d, %dx%d, format %#x.\n", debug_fboattachment(attachment), tex_type_str, name, width, height, fmt); - gl_info->gl_ops.gl.p_glBindTexture(tex_target, old_texture); - checkGLcall("Guess texture type"); + checkGLcall("guess texture type"); } else if (type == GL_NONE) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 000d0b75469a..1be6d2bce9a9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3270,6 +3270,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glGetShaderiv) /* OpenGL 2.0 */ USE_GL_FUNC(glGetShaderSource) /* OpenGL 2.0 */ USE_GL_FUNC(glGetStringi) /* OpenGL 3.0 */ + USE_GL_FUNC(glGetTextureLevelParameteriv) /* OpenGL 4.5 */ + USE_GL_FUNC(glGetTextureParameteriv) /* OpenGL 4.5 */ USE_GL_FUNC(glGetUniformfv) /* OpenGL 2.0 */ USE_GL_FUNC(glGetUniformiv) /* OpenGL 2.0 */ USE_GL_FUNC(glGetUniformLocation) /* OpenGL 2.0 */ -- 2.13.6

2 15

[PATCH v2 1/3] dhtmled.ocx: Add IOleObject interface to DHTMLEdit object
by Alex Henrie 09 Feb '18

09 Feb '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/dhtmled.ocx/edit.c | 283 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 268 insertions(+), 15 deletions(-) diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index 63d7a8f2e7..ef5a0c36e4 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -27,6 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dhtmled); typedef struct { IDHTMLEdit IDHTMLEdit_iface; + IOleObject IOleObject_iface; + IOleClientSite *client_site; LONG ref; } DHTMLEditImpl; @@ -35,10 +37,22 @@ static inline DHTMLEditImpl *impl_from_IDHTMLEdit(IDHTMLEdit *iface) return CONTAINING_RECORD(iface, DHTMLEditImpl, IDHTMLEdit_iface); } -static HRESULT WINAPI DHTMLEdit_QueryInterface(IDHTMLEdit *iface, REFIID iid, void **out) +static inline DHTMLEditImpl *impl_from_IOleObject(IOleObject *iface) { - DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + return CONTAINING_RECORD(iface, DHTMLEditImpl, IOleObject_iface); +} + +static ULONG dhtml_edit_addref(DHTMLEditImpl *This) +{ + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + return ref; +} + +static HRESULT dhtml_edit_qi(DHTMLEditImpl *This, REFIID iid, void **out) +{ TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IUnknown) || @@ -46,8 +60,14 @@ static HRESULT WINAPI DHTMLEdit_QueryInterface(IDHTMLEdit *iface, REFIID iid, vo IsEqualGUID(iid, &IID_IDHTMLSafe) || IsEqualGUID(iid, &IID_IDHTMLEdit)) { - IUnknown_AddRef(iface); - *out = iface; + dhtml_edit_addref(This); + *out = &This->IDHTMLEdit_iface; + return S_OK; + } + else if (IsEqualGUID(iid, &IID_IOleObject)) + { + dhtml_edit_addref(This); + *out = &This->IOleObject_iface; return S_OK; } @@ -56,27 +76,36 @@ static HRESULT WINAPI DHTMLEdit_QueryInterface(IDHTMLEdit *iface, REFIID iid, vo return E_NOINTERFACE; } -static ULONG WINAPI DHTMLEdit_AddRef(IDHTMLEdit *iface) +static ULONG dhtml_edit_release(DHTMLEditImpl *This) { - DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); - LONG ref = InterlockedIncrement(&This->ref); + LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); + if (!ref) + { + if (This->client_site) + IOleClientSite_Release(This->client_site); + + HeapFree(GetProcessHeap(), 0, This); + } + return ref; } -static ULONG WINAPI DHTMLEdit_Release(IDHTMLEdit *iface) +static HRESULT WINAPI DHTMLEdit_QueryInterface(IDHTMLEdit *iface, REFIID iid, void **out) { - DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); - LONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); + return dhtml_edit_qi(impl_from_IDHTMLEdit(iface), iid, out); +} - if (!ref) - HeapFree(GetProcessHeap(), 0, This); +static ULONG WINAPI DHTMLEdit_AddRef(IDHTMLEdit *iface) +{ + return dhtml_edit_addref(impl_from_IDHTMLEdit(iface)); +} - return ref; +static ULONG WINAPI DHTMLEdit_Release(IDHTMLEdit *iface) +{ + return dhtml_edit_release(impl_from_IDHTMLEdit(iface)); } static HRESULT WINAPI DHTMLEdit_GetTypeInfoCount(IDHTMLEdit *iface, UINT *count) @@ -514,6 +543,228 @@ static const IDHTMLEditVtbl DHTMLEditVtbl = { DHTMLEdit_put_BrowseMode }; +static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID iid, void **out) +{ + return dhtml_edit_qi(impl_from_IOleObject(iface), iid, out); +} + +static ULONG WINAPI OleObject_AddRef(IOleObject *iface) +{ + return dhtml_edit_addref(impl_from_IOleObject(iface)); +} + +static ULONG WINAPI OleObject_Release(IOleObject *iface) +{ + return dhtml_edit_release(impl_from_IOleObject(iface)); +} + +static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite *value) +{ + DHTMLEditImpl *This = impl_from_IOleObject(iface); + + TRACE("(%p)->(%p)\n", This, value); + + if (This->client_site) + IOleClientSite_Release(This->client_site); + + if (value) + IOleClientSite_AddRef(value); + + This->client_site = value; + + return S_OK; +} + +static HRESULT WINAPI OleObject_GetClientSite(IOleObject *iface, IOleClientSite **value) +{ + DHTMLEditImpl *This = impl_from_IOleObject(iface); + + TRACE("(%p)->(%p)\n", This, value); + + if (This->client_site) + IOleClientSite_AddRef(This->client_site); + + *value = This->client_site; + + return S_OK; +} + +static HRESULT WINAPI OleObject_SetHostNames(IOleObject *iface, + const OLECHAR *container_app, const OLECHAR *container_obj) +{ + DHTMLEditImpl *This = impl_from_IOleObject(iface); + FIXME("(%p)->(%p, %p) stub\n", This, container_app, container_obj); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD save) +{ + DHTMLEditImpl *This = impl_from_IOleObject(iface); + FIXME("(%p)->(%u) stub\n", This, save); + return S_OK; +} + +static HRESULT WINAPI OleObject_SetMoniker(IOleObject *iface, DWORD moniker_id, IMoniker *value) +{ + DHTMLEditImpl *This = impl_from_IOleObject(iface); + FIXME("(%p)->(%u, %p) stub\n", This, moniker_id, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleObject_GetMoniker(IOleObject *iface, DWORD assign, DWORD moniker_id, IMoniker **value) +{ + DHTMLEditImpl *This = impl_from_IOleObject(iface); + FIXME("(%p)->(%u, %p) stub\n", This, moniker_id, value); + *value = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI OleObject_InitFromData(IOleObject *iface, IDataObject *data_obj, BOOL creation, DWORD reserved) +{ + DHTMLEditImpl *This = impl_from_IOleObject(iface); + FIXME("(%p)->(%p, %u, %u) stub\n", This, data_obj, creation, reserved); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleObject_GetClipboardData(IOleObject *iface, DWORD reserved, IDataObject **value) +{ + DHTMLEditImpl *This = impl_from_IOleObject(iface); + FIXME("(%p)->(%u, %p) stub\n", This, reserved, value); + *value = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG verb, MSG *msg, IOleClientSite *active_site, + LONG index, HWND parent, const RECT *pos) +{ + DHTMLEditImpl *This = impl_from_IOleObject(iface); + TRACE("(%p)->(%d, %p, %p, %d, %p, %p) stub\n", This, verb, msg, active_site, index, parent, pos); + + if (verb == OLEIVERB_INPLACEACTIVATE) + { + IOleClientSite_OnShowWindow(This->client_site, TRUE); + return S_OK; + } + + return E_NOTIMPL; +} + +static HRESULT WINAPI OleObject_EnumVerbs(IOleObject *iface, IEnumOLEVERB **verb) +{ + DHTMLEditImpl *This = impl_from_IOleObject(iface); + FIXME("(%p)->(%p) stub\n", This, verb); + *verb = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI OleObject_Update(IOleObject *iface) +{ + DHTMLEditImpl *This = impl_from_IOleObject(iface); + FIXME("(%p) stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleObject_IsUpToDate(IOleObject *iface) +{ + DHTMLEditImpl *This = impl_from_IOleObject(iface); + FIXME("(%p) stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleObject_GetUserClassID(IOleObject *iface, CLSID *clsid) +{ + DHTMLEditImpl *This = impl_from_IOleObject(iface); + FIXME("(%p)->(%p) stub\n", This, clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleObject_GetUserType(IOleObject *iface, DWORD type_type, OLECHAR **type) +{ + DHTMLEditImpl *This = impl_from_IOleObject(iface); + FIXME("(%p)->(%u, %p) stub\n", This, type_type, type); + *type = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI OleObject_SetExtent(IOleObject *iface, DWORD aspect, SIZEL *size_limit) +{ + DHTMLEditImpl *This = impl_from_IOleObject(iface); + FIXME("(%p)->(%u, %p) stub\n", This, aspect, size_limit); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD aspect, SIZEL *size_limit) +{ + DHTMLEditImpl *This = impl_from_IOleObject(iface); + FIXME("(%p)->(%u, %p) stub\n", This, aspect, size_limit); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *sink, DWORD *conn) +{ + DHTMLEditImpl *This = impl_from_IOleObject(iface); + FIXME("(%p)->(%p, %p) stub\n", This, sink, conn); + *conn = 0; + return E_NOTIMPL; +} + +static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD conn) +{ + DHTMLEditImpl *This = impl_from_IOleObject(iface); + FIXME("(%p)->(%u) stub\n", This, conn); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **advise) +{ + DHTMLEditImpl *This = impl_from_IOleObject(iface); + FIXME("(%p)->(%p) stub\n", This, advise); + *advise = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD aspect, DWORD *status) +{ + DHTMLEditImpl *This = impl_from_IOleObject(iface); + FIXME("(%p)->(%u, %p) stub\n", This, aspect, status); + *status = 0; + return E_NOTIMPL; +} + +static HRESULT WINAPI OleObject_SetColorScheme(IOleObject *iface, LOGPALETTE *palette) +{ + DHTMLEditImpl *This = impl_from_IOleObject(iface); + FIXME("(%p)->(%p) stub\n", This, palette); + return E_NOTIMPL; +} + +static const IOleObjectVtbl OleObjectVtbl = { + OleObject_QueryInterface, + OleObject_AddRef, + OleObject_Release, + OleObject_SetClientSite, + OleObject_GetClientSite, + OleObject_SetHostNames, + OleObject_Close, + OleObject_SetMoniker, + OleObject_GetMoniker, + OleObject_InitFromData, + OleObject_GetClipboardData, + OleObject_DoVerb, + OleObject_EnumVerbs, + OleObject_Update, + OleObject_IsUpToDate, + OleObject_GetUserClassID, + OleObject_GetUserType, + OleObject_SetExtent, + OleObject_GetExtent, + OleObject_Advise, + OleObject_Unadvise, + OleObject_EnumAdvise, + OleObject_GetMiscStatus, + OleObject_SetColorScheme +}; + HRESULT dhtml_edit_create(REFIID iid, void **out) { DHTMLEditImpl *This; @@ -526,6 +777,8 @@ HRESULT dhtml_edit_create(REFIID iid, void **out) return E_OUTOFMEMORY; This->IDHTMLEdit_iface.lpVtbl = &DHTMLEditVtbl; + This->IOleObject_iface.lpVtbl = &OleObjectVtbl; + This->client_site = NULL; This->ref = 1; ret = IDHTMLEdit_QueryInterface(&This->IDHTMLEdit_iface, iid, out); -- 2.16.1

2 5

[PATCH vkd3d v2] include: Cleanup d3d12 header files.
by Józef Kucia 09 Feb '18

09 Feb '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- v2: add vkd3d_d3dcommon.h to .gitignore --- Makefile.am | 3 + include/.gitignore | 1 + include/vkd3d_d3d12.idl | 154 +++++++++++++++++++++++++++++++------------- include/vkd3d_d3dcommon.idl | 49 ++++++++++++++ 4 files changed, 164 insertions(+), 43 deletions(-) create mode 100644 include/vkd3d_d3dcommon.idl diff --git a/Makefile.am b/Makefile.am index d8212b7ca80d..aeb66ebe207a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,6 +4,7 @@ AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/dummy -I$(srcdir)/include/ widl_headers = \ include/vkd3d_d3d12.h \ + include/vkd3d_d3dcommon.h \ include/vkd3d_dxgi.h \ include/vkd3d_dxgi1_2.h \ include/vkd3d_dxgi1_3.h \ @@ -17,6 +18,7 @@ vkd3d_public_headers = \ include/dummy/rpcndr.h \ include/vkd3d.h \ include/vkd3d_d3d12.h \ + include/vkd3d_d3dcommon.h \ include/vkd3d_dxgibase.h \ include/vkd3d_dxgiformat.h \ include/vkd3d_utils.h \ @@ -79,6 +81,7 @@ libvkd3d_la_SOURCES = \ include/private/vkd3d_memory.h \ include/private/vkd3d_test.h \ include/vkd3d_d3d12.idl \ + include/vkd3d_d3dcommon.idl \ include/vkd3d_unknown.idl \ libs/vkd3d/command.c \ libs/vkd3d/device.c \ diff --git a/include/.gitignore b/include/.gitignore index 17852a86c9d4..d21fd994a0b8 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -2,6 +2,7 @@ config.h config.h.in stamp-h1 vkd3d_d3d12.h +vkd3d_d3dcommon.h vkd3d_dxgi.h vkd3d_dxgi1_2.h vkd3d_dxgi1_3.h diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 3e8d9cb85133..2ccfa22d344f 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -20,7 +20,10 @@ import "vkd3d_windows.h"; import "vkd3d_dxgibase.idl"; -#include "vkd3d_unknown.idl" +import "vkd3d_d3dcommon.idl"; + +cpp_quote("#ifndef _D3D12_CONSTANTS") +cpp_quote("#define _D3D12_CONSTANTS") const UINT D3D12_CS_TGSM_REGISTER_COUNT = 8192; const UINT D3D12_MAX_ROOT_COST = 64; @@ -48,10 +51,6 @@ const UINT D3D12_REQ_TEXTURE2D_U_OR_V_DIMENSION = 16384; const UINT D3D12_REQ_TEXTURE3D_U_V_OR_W_DIMENSION = 2048; const UINT D3D12_REQ_TEXTURECUBE_DIMENSION = 16384; const UINT D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES = 0xffffffff; -const UINT D3D12_SHADER_COMPONENT_MAPPING_MASK = 0x7; -const UINT D3D12_SHADER_COMPONENT_MAPPING_SHIFT = 3; -const UINT D3D12_SHADER_COMPONENT_MAPPING_ALWAYS_SET_BIT_AVOIDING_ZEROMEM_MISTAKES - = 1 << (D3D12_SHADER_COMPONENT_MAPPING_SHIFT * 4); const UINT D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT = 8; const UINT D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT = 256; const UINT D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT = 65536; @@ -60,15 +59,12 @@ const UINT D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT = 512; const UINT D3D12_VS_INPUT_REGISTER_COUNT = 32; const UINT D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE = 16; -[uuid(8BA5FB08-5195-40E2-AC58-0D989C3A0102), object, local, pointer_default(unique)] -interface ID3D10Blob : IUnknown -{ - void *GetBufferPointer(); - SIZE_T GetBufferSize(); -} +cpp_quote("#endif") -typedef ID3D10Blob ID3DBlob; -cpp_quote("#define IID_ID3DBlob IID_ID3D10Blob") +const UINT D3D12_SHADER_COMPONENT_MAPPING_MASK = 0x7; +const UINT D3D12_SHADER_COMPONENT_MAPPING_SHIFT = 3; +const UINT D3D12_SHADER_COMPONENT_MAPPING_ALWAYS_SET_BIT_AVOIDING_ZEROMEM_MISTAKES + = 1 << (D3D12_SHADER_COMPONENT_MAPPING_SHIFT * 4); typedef enum D3D_PRIMITIVE_TOPOLOGY { @@ -80,19 +76,6 @@ typedef enum D3D_PRIMITIVE_TOPOLOGY D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = 5, } D3D_PRIMITIVE_TOPOLOGY; -typedef enum D3D_FEATURE_LEVEL -{ - D3D_FEATURE_LEVEL_9_1 = 0x9100, - D3D_FEATURE_LEVEL_9_2 = 0x9200, - D3D_FEATURE_LEVEL_9_3 = 0x9300, - D3D_FEATURE_LEVEL_10_0 = 0xa000, - D3D_FEATURE_LEVEL_10_1 = 0xa100, - D3D_FEATURE_LEVEL_11_0 = 0xb000, - D3D_FEATURE_LEVEL_11_1 = 0xb100, - D3D_FEATURE_LEVEL_12_0 = 0xc000, - D3D_FEATURE_LEVEL_12_1 = 0xc100, -} D3D_FEATURE_LEVEL; - typedef enum D3D12_SHADER_MIN_PRECISION_SUPPORT { D3D12_SHADER_MIN_PRECISION_SUPPORT_NONE = 0x0, @@ -1567,7 +1550,12 @@ typedef struct D3D12_SUBRESOURCE_DATA LONG_PTR SlicePitch; } D3D12_SUBRESOURCE_DATA; -[uuid(C4FEC28F-7966-4E95-9F94-F431CB56C3B8), object, local, pointer_default(unique)] +[ + uuid(c4fec28f-7966-4e95-9f94-f431cb56c3b8), + object, + local, + pointer_default(unique) +] interface ID3D12Object : IUnknown { HRESULT GetPrivateData(REFGUID guid, UINT *data_size, void *data); @@ -1576,18 +1564,33 @@ interface ID3D12Object : IUnknown HRESULT SetName(const WCHAR *name); } -[uuid(905DB94B-A00C-4140-9DF5-2B64CA9EA357), object, local, pointer_default(unique)] +[ + uuid(905db94b-a00c-4140-9df5-2b64ca9ea357), + object, + local, + pointer_default(unique) +] interface ID3D12DeviceChild : ID3D12Object { HRESULT GetDevice(REFIID riid, void **device); } -[uuid(63EE58FB-1268-4835-86DA-F008CE62F0D6), object, local, pointer_default(unique)] +[ + uuid(63ee58fb-1268-4835-86da-f008ce62f0d6), + object, + local, + pointer_default(unique) +] interface ID3D12Pageable : ID3D12DeviceChild { } -[uuid(696442BE-A72E-4059-BC79-5B5C98040FAD), object, local, pointer_default(unique)] +[ + uuid(696442be-a72e-4059-bc79-5b5c98040fad), + object, + local, + pointer_default(unique) +] interface ID3D12Resource : ID3D12Pageable { HRESULT Map(UINT sub_resource, const D3D12_RANGE *read_range, void **data); @@ -1605,7 +1608,12 @@ interface ID3D12Resource : ID3D12Pageable HRESULT GetHeapProperties(D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS *flags); } -[uuid(7116D91C-E7E4-47CE-B8C6-EC8168F437E5), object, local, pointer_default(unique)] +[ + uuid(7116d91c-e7e4-47ce-b8c6-ec8168f437e5), + object, + local, + pointer_default(unique) +] interface ID3D12CommandList : ID3D12DeviceChild { D3D12_COMMAND_LIST_TYPE GetType(); @@ -1688,7 +1696,12 @@ typedef enum D3D12_PREDICATION_OP D3D12_PREDICATION_OP_NOT_EQUAL_ZERO = 1, } D3D12_PREDICATION_OP; -[uuid(8EFB471D-616C-4F49-90F7-127BB763FA51), object, local, pointer_default(unique)] +[ + uuid(8efb471d-616c-4f49-90f7-127bb763fa51), + object, + local, + pointer_default(unique) +] interface ID3D12DescriptorHeap : ID3D12Pageable { D3D12_DESCRIPTOR_HEAP_DESC GetDesc(); @@ -1697,17 +1710,32 @@ interface ID3D12DescriptorHeap : ID3D12Pageable D3D12_GPU_DESCRIPTOR_HANDLE GetGPUDescriptorHandleForHeapStart(); } -[uuid(0d9658ae-ed45-469e-a61d-970ec583cab4), object, local, pointer_default(unique)] +[ + uuid(0d9658ae-ed45-469e-a61d-970ec583cab4), + object, + local, + pointer_default(unique) +] interface ID3D12QueryHeap : ID3D12Pageable { } -[uuid(c36a797c-ec80-4f0a-8985-a7b2475082d1), object, local, pointer_default(unique)] +[ + uuid(c36a797c-ec80-4f0a-8985-a7b2475082d1), + object, + local, + pointer_default(unique) +] interface ID3D12CommandSignature : ID3D12Pageable { } -[uuid(5B160D0F-AC1B-4185-8BA8-B3AE42A5A455), object, local, pointer_default(unique)] +[ + uuid(5b160d0f-ac1b-4185-8ba8-b3ae42a5a455), + object, + local, + pointer_default(unique) +] interface ID3D12GraphicsCommandList : ID3D12CommandList { HRESULT Close(); @@ -1835,7 +1863,12 @@ typedef enum D3D12_TILE_MAPPING_FLAGS D3D12_TILE_MAPPING_FLAG_NO_HAZARD = 0x1, } D3D12_TILE_MAPPING_FLAGS; -[uuid(0EC870A6-5D7E-4C22-8CFC-5BAAE07616ED), object, local, pointer_default(unique)] +[ + uuid(0ec870a6-5d7e-4c22-8cfc-5baae07616ed), + object, + local, + pointer_default(unique) +] interface ID3D12CommandQueue : ID3D12Pageable { void UpdateTileMappings(ID3D12Resource *resource, UINT region_count, @@ -1943,18 +1976,33 @@ typedef struct D3D12_COMMAND_SIGNATURE_DESC UINT NodeMask; } D3D12_COMMAND_SIGNATURE_DESC; -[uuid(C54A6B66-72DF-4EE8-8BE5-A946A1429214), object, local, pointer_default(unique)] +[ + uuid(c54a6b66-72df-4ee8-8be5-a946a1429214), + object, + local, + pointer_default(unique) +] interface ID3D12RootSignature : ID3D12DeviceChild { } -[uuid(765A30F3-F624-4C6F-A828-ACE948622445), object, local, pointer_default(unique)] +[ + uuid(765a30f3-f624-4c6f-a828-ace948622445), + object, + local, + pointer_default(unique) +] interface ID3D12PipelineState : ID3D12Pageable { HRESULT GetCachedBlob(ID3DBlob **blob); } -[uuid(0A753DCF-C4D8-4B91-ADF6-BE5A60D95A76), object, local, pointer_default(unique)] +[ + uuid(0a753dcf-c4d8-4b91-adf6-be5a60d95a76), + object, + local, + pointer_default(unique) +] interface ID3D12Fence : ID3D12Pageable { UINT64 GetCompletedValue(); @@ -1962,13 +2010,23 @@ interface ID3D12Fence : ID3D12Pageable HRESULT Signal(UINT64 value); } -[uuid(6102DEE4-AF59-4B09-B999-B44D73F09B24), object, local, pointer_default(unique)] +[ + uuid(6102dee4-af59-4b09-b999-b44d73f09b24), + object, + local, + pointer_default(unique) +] interface ID3D12CommandAllocator : ID3D12Pageable { HRESULT Reset(); } -[uuid(189819F1-1DB6-4B57-BE54-1821339B85F7), object, local, pointer_default(unique)] +[ + uuid(189819f1-1db6-4b57-be54-1821339b85f7), + object, + local, + pointer_default(unique) +] interface ID3D12Device : ID3D12Object { UINT GetNodeCount(); @@ -2091,13 +2149,23 @@ interface ID3D12Device : ID3D12Object LUID GetAdapterLuid(); } -[uuid(344488B7-6846-474B-B989-F027448245E0), object, local, pointer_default(unique)] +[ + uuid(344488b7-6846-474b-b989-f027448245e0), + object, + local, + pointer_default(unique) +] interface ID3D12Debug : IUnknown { void EnableDebugLayer(); } -[uuid(34ab647b-3cc8-46ac-841b-c0965645c046), object, local, pointer_default(unique)] +[ + uuid(34ab647b-3cc8-46ac-841b-c0965645c046), + object, + local, + pointer_default(unique) +] interface ID3D12RootSignatureDeserializer : IUnknown { const D3D12_ROOT_SIGNATURE_DESC *GetRootSignatureDesc(); diff --git a/include/vkd3d_d3dcommon.idl b/include/vkd3d_d3dcommon.idl new file mode 100644 index 000000000000..1ddfce3c3d34 --- /dev/null +++ b/include/vkd3d_d3dcommon.idl @@ -0,0 +1,49 @@ +/* + * Copyright 2016 Józef Kucia 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 + */ + +import "vkd3d_windows.h"; + +#include "vkd3d_unknown.idl" + +typedef enum D3D_FEATURE_LEVEL +{ + D3D_FEATURE_LEVEL_9_1 = 0x9100, + D3D_FEATURE_LEVEL_9_2 = 0x9200, + D3D_FEATURE_LEVEL_9_3 = 0x9300, + D3D_FEATURE_LEVEL_10_0 = 0xa000, + D3D_FEATURE_LEVEL_10_1 = 0xa100, + D3D_FEATURE_LEVEL_11_0 = 0xb000, + D3D_FEATURE_LEVEL_11_1 = 0xb100, + D3D_FEATURE_LEVEL_12_0 = 0xc000, + D3D_FEATURE_LEVEL_12_1 = 0xc100, +} D3D_FEATURE_LEVEL; + +[ + uuid(8ba5fb08-5195-40e2-ac58-0d989c3a0102), + object, + local, + pointer_default(unique) +] +interface ID3D10Blob : IUnknown +{ + void *GetBufferPointer(); + SIZE_T GetBufferSize(); +} + +typedef ID3D10Blob ID3DBlob; +cpp_quote("#define IID_ID3DBlob IID_ID3D10Blob") -- 2.13.6

2 1

[PATCH] jscript: Improve interp_local debug traces.
by Jacek Caban 09 Feb '18

09 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 4/5] kerberos: Allocate a buffer for the package info structure in kerberos_SpQueryContextAttributes.
by Hans Leidekker 09 Feb '18

09 Feb '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 8d02e97832..e2ac7d375a 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -46,6 +46,7 @@ #include "wine/heap.h" #include "wine/library.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(kerberos); @@ -1060,6 +1061,24 @@ static NTSTATUS NTAPI kerberos_SpDeleteContext( LSA_SEC_HANDLE context ) #endif } +static SecPkgInfoW *build_package_info( const SecPkgInfoW *info ) +{ + SecPkgInfoW *ret; + DWORD size_name = (strlenW(info->Name) + 1) * sizeof(WCHAR); + DWORD size_comment = (strlenW(info->Comment) + 1) * sizeof(WCHAR); + + if (!(ret = heap_alloc( sizeof(*ret) + size_name + size_comment ))) return NULL; + ret->fCapabilities = info->fCapabilities; + ret->wVersion = info->wVersion; + ret->wRPCID = info->wRPCID; + ret->cbMaxToken = info->cbMaxToken; + ret->Name = (SEC_WCHAR *)(ret + 1); + memcpy( ret->Name, info->Name, size_name ); + ret->Comment = (SEC_WCHAR *)((char *)ret->Name + size_name); + memcpy( ret->Comment, info->Comment, size_comment ); + return ret; +} + static NTSTATUS NTAPI kerberos_SpQueryContextAttributes( LSA_SEC_HANDLE context, ULONG attribute, void *buffer ) { TRACE( "(%lx %u %p)\n", context, attribute, buffer ); @@ -1104,7 +1123,7 @@ static NTSTATUS NTAPI kerberos_SpQueryContextAttributes( LSA_SEC_HANDLE context, case SECPKG_ATTR_NEGOTIATION_INFO: { SecPkgContext_NegotiationInfoW *info = (SecPkgContext_NegotiationInfoW *)buffer; - info->PackageInfo = (SecPkgInfoW *)&infoW; + if (!(info->PackageInfo = build_package_info( &infoW ))) return SEC_E_INSUFFICIENT_MEMORY; info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; return SEC_E_OK; } -- 2.11.0

2 8

[PATCH 1/5] comctl32/pager: Use the global HeapAlloc() helpers
by Nikolay Sivov 09 Feb '18

09 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/pager.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index e9bcbe8c06..fe68515e67 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -62,6 +62,7 @@ #include "commctrl.h" #include "comctl32.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(pager); @@ -556,7 +557,7 @@ PAGER_Create (HWND hwnd, const CREATESTRUCTW *lpcs) PAGER_INFO *infoPtr; /* allocate memory for info structure */ - infoPtr = Alloc (sizeof(PAGER_INFO)); + infoPtr = heap_alloc_zero (sizeof(*infoPtr)); if (!infoPtr) return -1; SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); @@ -588,7 +589,7 @@ static LRESULT PAGER_Destroy (PAGER_INFO *infoPtr) { SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); - Free (infoPtr); /* free pager info data */ + heap_free (infoPtr); return 0; } -- 2.15.1

1 4

[PATCH 0/8] Initial dhtmled.ocx implementation
by Alex Henrie 09 Feb '18

09 Feb '18

See https://bugs.winehq.org/show_bug.cgi?id=29709 This patchset gets RSSeditor to show its user interface before exiting, which is as much as it does on Wine with native dhtmled.ocx and native triedit.dll. Jacek would be a good person to review these patches. Alex Henrie (8): include: Add dhtmled.idl dhtmled.ocx: Add stub DLL and stub DHTMLEdit object dhtmled.ocx: Add IQuickActivate interface to DHTMLEdit object dhtmled.ocx: Add IViewObject interface to DHTMLEdit object dhtmled.ocx: Add IOleObject interface to DHTMLEdit object dhtmled.ocx: Add IOleControl interface to HTMLEdit object dhtmled.ocx: Add IPersistStreamInit interface to HTMLEdit object dhtmled.ocx: Add IConnectionPointContainer interface to HTMLEdit object configure.ac | 1 + dlls/dhtmled.ocx/Makefile.in | 8 + dlls/dhtmled.ocx/dhtmled.ocx.spec | 4 + dlls/dhtmled.ocx/dhtmled_classes.idl | 39 ++ dlls/dhtmled.ocx/dhtmled_private.h | 19 + dlls/dhtmled.ocx/dhtmled_tlb.idl | 21 + dlls/dhtmled.ocx/edit.c | 1124 ++++++++++++++++++++++++++++++++++ dlls/dhtmled.ocx/main.c | 162 +++++ include/Makefile.in | 1 + include/dhtmled.idl | 330 ++++++++++ 10 files changed, 1709 insertions(+) create mode 100644 dlls/dhtmled.ocx/Makefile.in create mode 100644 dlls/dhtmled.ocx/dhtmled.ocx.spec create mode 100644 dlls/dhtmled.ocx/dhtmled_classes.idl create mode 100644 dlls/dhtmled.ocx/dhtmled_private.h create mode 100644 dlls/dhtmled.ocx/dhtmled_tlb.idl create mode 100644 dlls/dhtmled.ocx/edit.c create mode 100644 dlls/dhtmled.ocx/main.c create mode 100644 include/dhtmled.idl -- 2.15.1

4 15