June 2016 - Wine-Devel - list.winehq.org

Re: [PATCH 2/2] advapi32: add some advapi32 wmi functions (try 2)

by Sebastian Lackner

On 03.06.2016 03:53, Austin English wrote: > -- -Austin GPG: 14FB D7EA A041 937B > > > 0002-advapi32-add-some-advapi32-wmi-functions-try-2.patch > > > From 43b496fab6de5cfa6521555d2c09c9d970a0e7ec Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Wed, 1 Jun 2016 23:02:02 -0500 > Subject: [PATCH 2/2] advapi32: add some advapi32 wmi functions (try 2) > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > dlls/advapi32/Makefile.in | 3 +- > dlls/advapi32/advapi32.spec | 30 ++++---- > dlls/advapi32/eventlog.c | 9 --- > dlls/advapi32/wmi.c | 174 ++++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 191 insertions(+), 25 deletions(-) > create mode 100644 dlls/advapi32/wmi.c > > diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in > index 6b54295..ff6452a 100644 > --- a/dlls/advapi32/Makefile.in > +++ b/dlls/advapi32/Makefile.in > @@ -18,7 +18,8 @@ C_SRCS = \ > lsa.c \ > registry.c \ > security.c \ > - service.c > + service.c \ > + wmi.c > > IDL_SRCS = svcctl.idl > > diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec > index 3f32aa3..d278d67 100644 > --- a/dlls/advapi32/advapi32.spec > +++ b/dlls/advapi32/advapi32.spec > @@ -795,35 +795,35 @@ > # @ stub WmiDevInstToInstanceNameA > # @ stub WmiDevInstToInstanceNameW > # @ stub WmiEnumerateGuids > -# @ stub WmiExecuteMethodA > -# @ stub WmiExecuteMethodW > +@ stdcall WmiExecuteMethodA(long str long long ptr ptr ptr) > +@ stdcall WmiExecuteMethodW(long wstr long long ptr ptr ptr) > # @ stub WmiFileHandleToInstanceNameA > # @ stub WmiFileHandleToInstanceNameW > -# @ stub WmiFreeBuffer > +@ stdcall WmiFreeBuffer(ptr) > # @ stub WmiGetFirstTraceOffset > # @ stub WmiGetNextEvent > # @ stub WmiGetTraceHeader > -# @ stub WmiMofEnumerateResourcesA > -# @ stub WmiMofEnumerateResourcesW > -# @ stub WmiNotificationRegistrationA > -# @ stub WmiNotificationRegistrationW > -@ stdcall WmiOpenBlock(ptr long ptr) > +@ stdcall WmiMofEnumerateResourcesA(long ptr ptr) > +@ stdcall WmiMofEnumerateResourcesW(long ptr ptr) > +@ stdcall WmiNotificationRegistrationA(ptr long ptr ptr long) > +@ stdcall WmiNotificationRegistrationW(ptr long ptr ptr long) > +@ stdcall WmiOpenBlock(ptr long long) > # @ stub WmiOpenTraceWithCursor > # @ stub WmiParseTraceEvent > -# @ stub WmiQueryAllDataA > +@ stdcall WmiQueryAllDataA(long ptr ptr) > # @ stub WmiQueryAllDataMultipleA > # @ stub WmiQueryAllDataMultipleW > -# @ stub WmiQueryAllDataW > -# @ stub WmiQueryGuidInformation > +@ stdcall WmiQueryAllDataW(long ptr ptr) > +@ stdcall WmiQueryGuidInformation(long ptr) > # @ stub WmiQuerySingleInstanceA > # @ stub WmiQuerySingleInstanceMultipleA > # @ stub WmiQuerySingleInstanceMultipleW > @ stub WmiQuerySingleInstanceW > # @ stub WmiReceiveNotificationsA > # @ stub WmiReceiveNotificationsW > -# @ stub WmiSetSingleInstanceA > -@ stub WmiSetSingleInstanceW > -# @ stub WmiSetSingleItemA > -# @ stub WmiSetSingleItemW > +@ stdcall WmiSetSingleInstanceA(long str long long ptr) > +@ stdcall WmiSetSingleInstanceW(long wstr long long ptr) > +@ stdcall WmiSetSingleItemA(long str long long long ptr) > +@ stdcall WmiSetSingleItemW(long wstr long long long ptr) > # @ stub Wow64Win32ApiEntry > @ stdcall WriteEncryptedFileRaw(ptr ptr ptr) > diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c > index 93c164d..7274d98 100644 > --- a/dlls/advapi32/eventlog.c > +++ b/dlls/advapi32/eventlog.c > @@ -964,12 +964,3 @@ ULONG WINAPI EnumerateTraceGuids(PTRACE_GUID_PROPERTIES *propertiesarray, > FIXME("%p %d %p: stub\n", propertiesarray, arraycount, guidcount); > return ERROR_INVALID_PARAMETER; > } > - > -/****************************************************************************** > - * WmiOpenBlock [ADVAPI32.@] > - */ > -NTSTATUS WINAPI WmiOpenBlock(GUID *guid, ULONG access, PVOID *datablock) > -{ > - FIXME("%s %d %p: stub\n", debugstr_guid(guid), access, datablock); > - return ERROR_SUCCESS; > -} > diff --git a/dlls/advapi32/wmi.c b/dlls/advapi32/wmi.c > new file mode 100644 > index 0000000..16b6094 > --- /dev/null > +++ b/dlls/advapi32/wmi.c > @@ -0,0 +1,174 @@ > +/* > + * Win32 advapi/wmi functions > + * > + * Copyright 2016 Austin English > + * > + * 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 <stdarg.h> > + > +#include "windef.h" > +#include "winbase.h" > +#include "winerror.h" > +#include "winternl.h" > +#include "wmistr.h" You should define _WMI_SOURCE_ before including the wmium header file. > +#include "wmium.h" > + > +#include "wine/unicode.h" > +#include "wine/debug.h" > + > +#include "advapi32_misc.h" > + > +WINE_DEFAULT_DEBUG_CHANNEL(wmi); > + > +/****************************************************************************** > + * WmiExecuteMethodA [ADVAPI32.@] > + */ > +ULONG WMIAPI WmiExecuteMethodA(WMIHANDLE handle, const char *instance, ULONG method, ULONG inputsize, > + void *inputbuffer, ULONG *outputsize, void *outputbuffer) > +{ > + FIXME(": %p %s %u %u %p %p %p stub\n", handle, debugstr_a(instance), method, inputsize, inputbuffer, > + outputsize, outputbuffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +/****************************************************************************** > + * WmiExecuteMethodW [ADVAPI32.@] > + */ > +ULONG WMIAPI WmiExecuteMethodW(WMIHANDLE handle, const WCHAR *instance, ULONG method, ULONG inputsize, > + void *inputbuffer, ULONG *outputsize, void *outputbuffer) > +{ > + FIXME(": %p %s %u %u %p %p %p stub\n", handle, debugstr_w(instance), method, inputsize, inputbuffer, > + outputsize, outputbuffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +/****************************************************************************** > + * WmiFreeBuffer [ADVAPI32.@] > + */ > +void WMIAPI WmiFreeBuffer(void *buffer) > +{ > + HeapFree(GetProcessHeap(), 0, buffer); Currently there are no functions to allocate memory, so a stub here would probably be preferred. > +} > + > +/****************************************************************************** > + * WmiMofEnumerateResourcesA [ADVAPI32.@] > + */ > +ULONG WMIAPI WmiMofEnumerateResourcesA(MOFHANDLE handle, ULONG *count, MOFRESOURCEINFOA **resource) > +{ > + FIXME(": %p %p %p stub\n", handle, count, resource); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +/****************************************************************************** > + * WmiMofEnumerateResourcesW [ADVAPI32.@] > + */ > +ULONG WMIAPI WmiMofEnumerateResourcesW(MOFHANDLE handle, ULONG *count, MOFRESOURCEINFOW **resource) > +{ > + FIXME(": %p %p %p stub\n", handle, count, resource); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +/****************************************************************************** > + * WmiNotificationRegistrationA [ADVAPI32.@] > + */ > +ULONG WMIAPI WmiNotificationRegistrationA(GUID *guid, BOOLEAN enable, void *info, ULONG_PTR *context, ULONG flags) > +{ > + FIXME(": %p %u %p %p 0x%08x stub\n", guid, enable, info, context, flags); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +/****************************************************************************** > + * WmiNotificationRegistrationW [ADVAPI32.@] > + */ > +ULONG WMIAPI WmiNotificationRegistrationW(GUID *guid, BOOLEAN enable, void *info, ULONG_PTR *context, ULONG flags) > +{ > + FIXME(": %p %u %p %p 0x%08x stub\n", guid, enable, info, context, flags); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +/****************************************************************************** > + * WmiOpenBlock [ADVAPI32.@] > + */ > +ULONG WINAPI WmiOpenBlock(GUID *guid, ULONG access, WMIHANDLE *handle) > +{ > + FIXME("%s %d %p: stub\n", debugstr_guid(guid), access, handle); > + return ERROR_SUCCESS; > +} > + > +/****************************************************************************** > + * WmiQueryAllDataA [ADVAPI32.@] > + */ > +ULONG WMIAPI WmiQueryAllDataA(WMIHANDLE handle, ULONG *buffersize, void *buffer) > +{ > + FIXME(": %p %p %p stub\n", handle, buffersize, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +/****************************************************************************** > + * WmiQueryAllDataW [ADVAPI32.@] > + */ > +ULONG WMIAPI WmiQueryAllDataW(WMIHANDLE handle, ULONG *buffersize, void *buffer) > +{ > + FIXME(": %p %p %p stub\n", handle, buffersize, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +/****************************************************************************** > + * WmiQueryGuidInformation [ADVAPI32.@] > + */ > +ULONG WMIAPI WmiQueryGuidInformation(WMIHANDLE handle, WMIGUIDINFORMATION *guidinfo) > +{ > + FIXME(": %p %p stub\n", handle, guidinfo); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +/****************************************************************************** > + * WmiSetSingleInstanceA [ADVAPI32.@] > + */ > +ULONG WMIAPI WmiSetSingleInstanceA(WMIHANDLE handle, const char *name, ULONG reserved, ULONG size, void *buffer) > +{ > + FIXME(": %p %s %u %u %p stub\n", handle, debugstr_a(name), reserved, size, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +/****************************************************************************** > + * WmiSetSingleInstanceW [ADVAPI32.@] > + */ > +ULONG WMIAPI WmiSetSingleInstanceW(WMIHANDLE handle, const WCHAR *name, ULONG reserved, ULONG size, void *buffer) > +{ > + FIXME(": %p %s %u %u %p stub\n", handle, debugstr_w(name), reserved, size, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +/****************************************************************************** > + * WmiSetSingleItemA [ADVAPI32.@] > + */ > +ULONG WMIAPI WmiSetSingleItemA(WMIHANDLE handle, const char *name, ULONG id, ULONG reserved, ULONG size, void *buffer) > +{ > + FIXME(": %p %s %u %u %p stub\n", handle, debugstr_a(name), reserved, size, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +/****************************************************************************** > + * WmiSetSingleItemW [ADVAPI32.@] > + */ > +ULONG WMIAPI WmiSetSingleItemW(WMIHANDLE handle, const WCHAR *name, ULONG id, ULONG reserved, ULONG size, void *buffer) > +{ > + FIXME(": %p %s %u %u %p stub\n", handle, debugstr_w(name), reserved, size, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > -- 2.7.3 > > >

June 6, 2016

Re: [PATCH 1/2] include: add wmium.h (try 2)

by Sebastian Lackner

On 03.06.2016 03:52, Austin English wrote: > -- -Austin GPG: 14FB D7EA A041 937B > > > 0001-include-add-wmium.h-try-2.patch > > > From 9e8d9cfd169c5233958ba0f6a1b7ec0a0559ec92 Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Wed, 1 Jun 2016 22:57:12 -0500 > Subject: [PATCH 1/2] include: add wmium.h (try 2) > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > include/Makefile.in | 1 + > include/wmium.h | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 117 insertions(+) > create mode 100644 include/wmium.h > > diff --git a/include/Makefile.in b/include/Makefile.in > index 250166d..a9e0565 100644 > --- a/include/Makefile.in > +++ b/include/Makefile.in > @@ -666,6 +666,7 @@ HEADER_SRCS = \ > winver.h \ > wlanapi.h \ > wmistr.h \ > + wmium.h \ > wnaspi32.h \ > wownt32.h \ > ws2def.h \ > diff --git a/include/wmium.h b/include/wmium.h > new file mode 100644 > index 0000000..cb75ae0 > --- /dev/null > +++ b/include/wmium.h > @@ -0,0 +1,116 @@ > +/* > + * Copyright (C) 2016 Austin English > + * > + * 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 > + */ > +#ifndef _WMIUM_ > +#define _WMIUM_ > + > +#ifdef _WMI_SOURCE_ > +#define WMIAPI __stdcall > +#else > +#define WMIAPI DECLSPEC_IMPORT __stdcall > +#endif > + > +#include <guiddef.h> > +#include <basetsd.h> > +#include <wmistr.h> > + > +typedef PVOID WMIHANDLE, *PWMIHANDLE, MOFHANDLE, *PMOFHANDLE; > + > +#define MOFCI_reserved0 0x00000001 > +#define MOFCI_reserved1 0x00000002 > +#define MOFCI_reserved2 0x00000004 Based on my header files, the "reserved" should be uppercase here. > + > +typedef struct > +{ > + char *ImagePath; > + char *ResourceName; > + ULONG ResourceSize; > + UCHAR *Resourcebuffer; Buffer should start with an uppercase letter here. > +} MOFRESOURCEINFOA, *PMOFRESOURCEINFOA; > + > +typedef struct > +{ > + WCHAR *ImagePath; > + WCHAR *ResourceName; > + ULONG ResourceSize; > + UCHAR *Resourcebuffer; Here too. > +} MOFRESOURCEINFOW, *PMOFRESOURCEINFOW; > + > +DECL_WINELIB_TYPE_AW(MOFRESOURCEINFO); > +DECL_WINELIB_TYPE_AW(PMOFRESOURCEINFO); > + > +#ifdef __cplusplus > +extern "C" { > +#endif > + > +#define NOTIFICATION_TRACE_FLAG 0x00010000 > +#define NOTIFICATION_CALLBACK_DIRECT 0x00000004 > +#define NOTIFICATION_CHECK_ACCESS 0x00000008 > + > +typedef void (WINAPI *NOTIFICATIONCALLBACK)(WNODE_HEADER *, UINT_PTR); > + > +typedef struct _WMIGUIDINFORMATION > +{ > + ULONG Size; > + BOOLEAN IsExpensive; > + BOOLEAN IsEventOnly; > +} WMIGUIDINFORMATION, *PWMIGUIDINFORMATION; > + > +DEFINE_GUID(GUID_REGISTRATION_CHANGE_NOTIFICATION, 0xb48d49a1, 0xe777, 0x11d0, 0xa5, 0xc, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0x10); > +DEFINE_GUID(GUID_MOF_RESOURCE_ADDED_NOTIFICATION, 0xb48d49a2, 0xe777, 0x11d0, 0xa5, 0xc, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0x10); > +DEFINE_GUID(GUID_MOF_RESOURCE_REMOVED_NOTIFICATION, 0xb48d49a3, 0xe777, 0x11d0, 0xa5, 0xc, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0x10); > + > +ULONG WMIAPI WmiCloseBlock(WMIHANDLE); > +ULONG WMIAPI WmiDevInstToInstanceNameA(char *, ULONG, char *, ULONG); > +ULONG WMIAPI WmiDevInstToInstanceNameW(WCHAR *, ULONG, WCHAR *, ULONG); > +ULONG WMIAPI WmiEnumerateGuids(LPGUID, ULONG *); > +ULONG WMIAPI WmiExecuteMethodA(WMIHANDLE, const char *, ULONG, ULONG, void *, ULONG *, void *); > +ULONG WMIAPI WmiExecuteMethodW(WMIHANDLE, const WCHAR *, ULONG, ULONG, void *, ULONG *, void *); > +ULONG WMIAPI WmiFileHandleToInstanceNameA(WMIHANDLE, HANDLE, ULONG *, char *); > +ULONG WMIAPI WmiFileHandleToInstanceNameW(WMIHANDLE, HANDLE, ULONG *, WCHAR *); > +void WMIAPI WmiFreeBuffer(void *); > +#define WmiInsertTimestamp(WnodeHeader) GetSystemTimeAsFileTime((FILETIME *)&((*WNODE_HEADER)WnodeHeader)->TimeStamp) I believe you wanted to write "WNODE_HEADER *" instead of "*WNODE_HEADER". > +ULONG WMIAPI WmiMofEnumerateResourcesA(MOFHANDLE, ULONG *, PMOFRESOURCEINFOA *); > +ULONG WMIAPI WmiMofEnumerateResourcesW(MOFHANDLE, ULONG *, PMOFRESOURCEINFOW *); > +ULONG WMIAPI WmiNotificationRegistrationA(LPGUID, BOOLEAN, void *, ULONG_PTR *, ULONG); > +ULONG WMIAPI WmiNotificationRegistrationW(LPGUID, BOOLEAN, void *, ULONG_PTR *, ULONG); The ULONG_PTR argument is no pointer here. > +ULONG WMIAPI WmiOpenBlock(GUID *, ULONG, WMIHANDLE *); > +ULONG WMIAPI WmiQueryAllDataA(WMIHANDLE, ULONG *, void *); > +ULONG WMIAPI WmiQueryAllDataW(WMIHANDLE, ULONG *, void *); > +ULONG WMIAPI WmiQueryGuidInformation(WMIHANDLE, PWMIGUIDINFORMATION); > +ULONG WMIAPI WmiQuerySingleInstanceA(WMIHANDLE, const char *, ULONG *, void *); > +ULONG WMIAPI WmiQuerySingleInstanceW(WMIHANDLE, const WCHAR *, ULONG *, void *); > +ULONG WMIAPI WmiSetSingleInstanceA(WMIHANDLE, const char *, ULONG, ULONG, void *); > +ULONG WMIAPI WmiSetSingleInstanceW(WMIHANDLE, const WCHAR *, ULONG, ULONG, void *); > +ULONG WMIAPI WmiSetSingleItemA(WMIHANDLE, const char *, ULONG, ULONG, ULONG, void *); > +ULONG WMIAPI WmiSetSingleItemW(WMIHANDLE, const WCHAR *, ULONG, ULONG, ULONG, void *); > + > +DECL_WINELIB_TYPE_AW(WmiDevInstToInstanceName) > +DECL_WINELIB_TYPE_AW(WmiExecuteMethod) > +DECL_WINELIB_TYPE_AW(WmiFileHandleToInstanceName) > +DECL_WINELIB_TYPE_AW(WmiMofEnumerateResources) > +DECL_WINELIB_TYPE_AW(WmiNotificationRegistration) > +DECL_WINELIB_TYPE_AW(WmiQueryAllData) > +DECL_WINELIB_TYPE_AW(WmiQuerySingleInstance) > +DECL_WINELIB_TYPE_AW(WmiSetSingleInstance) > +DECL_WINELIB_TYPE_AW(WmiSetSingleItem) > + > +#ifdef __cplusplus > +} > +#endif > + > +#endif /* _WMIUM_ */ > -- 2.7.3 > > >

June 6, 2016

Re: [PATCH 4/6] wined3d: Create texture views for shader resource views.

by Józef Kucia

On Mon, Jun 6, 2016 at 2:59 PM, Henri Verbeet <hverbeet(a)gmail.com> wrote: > On 6 June 2016 at 11:39, Józef Kucia <jkucia(a)codeweavers.com> wrote: >> +static BOOL gl_internal_format_equal(const struct wined3d_format *format1, >> + const struct wined3d_format *format2) >> +{ >> + return format1->id == format2->id >> + || (format1->glInternal == format2->glInternal >> + && format1->glGammaInternal == format2->glGammaInternal >> + && format1->rtInternal == format2->rtInternal); >> +} > When would you use this? I was under the impression that Direct3D > views were a bit more restricted then OpenGL views and only work > between formats based on the same typeless format. It's mostly for the case when a view is created for a typeless format with depth/stencil internal format in wined3d. The other condition in gl_texture_view_compatible() rejects depth/stencil formats because OpenGL texture views cannot be created between RGB and depth/stencil formats. This condition is more permissive than it should be because I wanted to avoid "regressions". Previously, we allowed creating any shader view with no validation. I guess I could also introduce an additional GLenum field in wined3d_format for GL_VIEW_COMPATIBILITY_CLASS and make the condition in gl_texture_view_compatible() more explicit and clear, i.e. format1->gl_view_class == format2->gl_view_class && format1->typeless_id == format2->typeless_id.

June 6, 2016

Re: [03/10] msvcirt: Implement ostream::flush

by Piotr Caban

On 06/06/16 13:52, Iván Matellanes wrote: > DEFINE_THISCALL_WRAPPER(ostream_flush, 4) > ostream* __thiscall ostream_flush(ostream *this) > { > - FIXME("(%p) stub\n", this); > + ios *base = ostream_get_ios(this); > + > + TRACE("(%p)\n", this); > + > + if (call_streambuf_sync(base->sb) == EOF) > + ios_clear(base, base->state | IOSTATE_failbit); This function should be thread-safe. Please use ios_lockbuf and ios_unlockbuf. Thanks, Piotr

June 6, 2016

Re: [PATCH 1/6] wined3d: Add wined3d_shader_resource_view_desc.

by Józef Kucia

On Mon, Jun 6, 2016 at 2:59 PM, Henri Verbeet <hverbeet(a)gmail.com> wrote: > Is the "view_type" field needed? I seem to remember that the view type > needs to match the resource type, so you shouldn't be able to e.g. > create a texture view on a buffer resource. The main other reasons I > can imagine for having the field are cube views, and perhaps shaders > making a distinction between array textures with a single layer and > non-array textures. The latter could easily be handled by setting > "layer_count" to ~0u for non-array textures, but since we have a > "flags" field with plenty of extra bits, I think we could just use > that to mark both cube and array views. Yes, this information can be encoded in the "flags" field. The main reasons for the "view_type" field are cube views and cube array views.

June 6, 2016

Re: [01/10] msvcirt: Add stub for class ostream

by Piotr Caban

On 06/06/16 13:52, Iván Matellanes wrote: > +DEFINE_THISCALL_WRAPPER(ostream_vector_dtor, 8) > +ostream* __thiscall ostream_vector_dtor(ostream *this, unsigned int flags) ostream_vector_dtor should probably take ios* as first argument. > +/* ??_Gostream@@UAEPAXI(a)Z */ > +DEFINE_THISCALL_WRAPPER(ostream_scalar_dtor, 8) > +ostream* __thiscall ostream_scalar_dtor(ostream *this, unsigned int flags) The same here. Thanks, Piotr

June 6, 2016

Re: [02/10] msvcirt: Implement ostream constructors/destructors

by Piotr Caban

On 06/06/16 13:52, Iván Matellanes wrote: > DEFINE_THISCALL_WRAPPER(ostream_copy_ctor, 12) > ostream* __thiscall ostream_copy_ctor(ostream *this, const ostream *copy, BOOL virt_init) > { > - FIXME("(%p %p %d) stub\n", this, copy, virt_init); > + ios *base, *copy_base; > + > + TRACE("(%p %p %d)\n", this, copy, virt_init); > + > + if (virt_init) > + this->vbtable = ostream_vbtable; > + base = ostream_get_ios(this); > + copy_base = ostream_get_ios(copy); > + ios_sb_ctor(base, copy_base->sb); > + base->vtable = &MSVCP_ostream_vtable; This is wrong if virt_init == FALSE. There should be something like: copy_base = ostream_get_ios(copy); if (virt_init) { this->vbtable = ostream_vbtable; base = ostream_get_ios(thjs); ios_sb_ctor(base, copy_base->sb); } else { base = ostream_get_ios(this); ios_init(base, copy_base->sb); } Keep in mind that this code was not tested. Please also add a test for ostream_copy_ctor(..., FALSE) call. Thanks, Piotr

June 6, 2016

Re: [PATCH 2/2] wined3d: Add some more Intel GPUs.

by Henri Verbeet

On 4 June 2016 at 22:07, Grazvydas Ignotas <notasas(a)gmail.com> wrote: > For HD Graphics 520 or newer, the whole system RAM seems to be reported > as VRAM. For now I've chosen 2048MB based on assumption that systems as > new as this will have at least 2GB of RAM. > > Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com> > --- > dlls/wined3d/directx.c | 5 +++++ > dlls/wined3d/wined3d_private.h | 5 +++++ > 2 files changed, 10 insertions(+) > This is fine, but could you also please add a generic "Skylake" fallback to cards_intel[] for cards with a different device ID?

June 6, 2016

Re: [PATCH 4/6] wined3d: Create texture views for shader resource views.

by Henri Verbeet

On 6 June 2016 at 11:39, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +static BOOL gl_internal_format_equal(const struct wined3d_format *format1, > + const struct wined3d_format *format2) > +{ > + return format1->id == format2->id > + || (format1->glInternal == format2->glInternal > + && format1->glGammaInternal == format2->glGammaInternal > + && format1->rtInternal == format2->rtInternal); > +} When would you use this? I was under the impression that Direct3D views were a bit more restricted then OpenGL views and only work between formats based on the same typeless format. > +static void wined3d_shader_resource_view_create_texture_view(struct wined3d_shader_resource_view *view, > + const struct wined3d_shader_resource_view_desc *desc, const struct wined3d_format *view_format, > + struct wined3d_texture *texture) > +{ > + struct wined3d_context *context = context_acquire(texture->resource.device, NULL); > + const struct wined3d_gl_info *gl_info = context->gl_info; > + struct gl_texture *gl_texture; This is fairly minor, but context_acquire() potentially does real work. It seems somewhat inappropriate to "hide" it in the declarations.

June 6, 2016

Re: [PATCH 1/6] wined3d: Add wined3d_shader_resource_view_desc.

by Henri Verbeet

On 6 June 2016 at 11:39, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +enum wined3d_view_type > +{ > + WINED3D_VTYPE_BUFFER = 1, > + WINED3D_VTYPE_TEXTURE_1D = 2, > + WINED3D_VTYPE_TEXTURE_1D_ARRAY = 3, > + WINED3D_VTYPE_TEXTURE_2D = 4, > + WINED3D_VTYPE_TEXTURE_2D_ARRAY = 5, > + WINED3D_VTYPE_TEXTURE_3D = 6, > + WINED3D_VTYPE_TEXTURE_CUBE = 7, > + WINED3D_VTYPE_TEXTURE_CUBE_ARRAY = 8, > +}; > + Not a fan of the "VTYPE" in the enum elements. It does match "RTYPE" from enum wined3d_resource_type, but that is itself a leftover from when it more closely matched D3DRESOURCETYPE. > +struct wined3d_shader_resource_view_desc > +{ > + enum wined3d_format_id format_id; > + enum wined3d_view_type view_type; > + union > + { > + struct > + { > + unsigned int start_idx; > + unsigned int count; > + unsigned int flags; > + } buffer; > + struct > + { > + unsigned int level_idx; > + unsigned int level_count; > + unsigned int layer_idx; > + unsigned int layer_count; > + } texture; > + } u; > +}; Is the "view_type" field needed? I seem to remember that the view type needs to match the resource type, so you shouldn't be able to e.g. create a texture view on a buffer resource. The main other reasons I can imagine for having the field are cube views, and perhaps shaders making a distinction between array textures with a single layer and non-array textures. The latter could easily be handled by setting "layer_count" to ~0u for non-array textures, but since we have a "flags" field with plenty of extra bits, I think we could just use that to mark both cube and array views.

June 6, 2016