Wine-Commits

wine-commits@list.winehq.org

June 2016

2 participants
592 discussions

Józef Kucia : wined3d: Add ARB_explicit_attrib_location extension.
by Alexandre Julliard June 1, 2016

June 1, 2016

Module: wine Branch: master Commit: a0658efb61490ffce9ed1581ff2c2ea0b770e933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0658efb61490ffce9ed1581f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 31 23:29:53 2016 +0200 wined3d: Add ARB_explicit_attrib_location extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c7bd3d4..fbfbb49 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -117,6 +117,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_draw_elements_base_vertex", ARB_DRAW_ELEMENTS_BASE_VERTEX }, {"GL_ARB_draw_instanced", ARB_DRAW_INSTANCED }, {"GL_ARB_ES2_compatibility", ARB_ES2_COMPATIBILITY }, + {"GL_ARB_explicit_attrib_location", ARB_EXPLICIT_ATTRIB_LOCATION }, {"GL_ARB_fragment_program", ARB_FRAGMENT_PROGRAM }, {"GL_ARB_fragment_shader", ARB_FRAGMENT_SHADER }, {"GL_ARB_framebuffer_object", ARB_FRAMEBUFFER_OBJECT }, @@ -3513,6 +3514,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_VERTEX_ARRAY_BGRA, MAKEDWORD_VERSION(3, 2)}, {ARB_BLEND_FUNC_EXTENDED, MAKEDWORD_VERSION(3, 3)}, + {ARB_EXPLICIT_ATTRIB_LOCATION, MAKEDWORD_VERSION(3, 3)}, {ARB_INSTANCED_ARRAYS, MAKEDWORD_VERSION(3, 3)}, {ARB_SAMPLER_OBJECTS, MAKEDWORD_VERSION(3, 3)}, {ARB_SHADER_BIT_ENCODING, MAKEDWORD_VERSION(3, 3)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 46df6ee..aa39d07 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -53,6 +53,7 @@ enum wined3d_gl_extension ARB_DRAW_ELEMENTS_BASE_VERTEX, ARB_DRAW_INSTANCED, ARB_ES2_COMPATIBILITY, + ARB_EXPLICIT_ATTRIB_LOCATION, ARB_FRAGMENT_PROGRAM, ARB_FRAGMENT_SHADER, ARB_FRAMEBUFFER_OBJECT,

1 0

Austin English : ntdll: Add WinSqmEndSession/WinSqmStartSession stubs.
by Alexandre Julliard June 1, 2016

June 1, 2016

Module: wine Branch: master Commit: 4f3607f7547d8b803adfceca41afcb11b30116ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f3607f7547d8b803adfceca4… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jun 1 09:00:07 2016 +0200 ntdll: Add WinSqmEndSession/WinSqmStartSession stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/misc.c | 22 +++++++++++++++++++++- dlls/ntdll/ntdll.spec | 2 ++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 0f6c5df..f540c4b 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -27,6 +27,8 @@ #include <sys/utsname.h> #endif +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "wine/library.h" #include "wine/debug.h" #include "ntdll_misc.h" @@ -329,16 +331,34 @@ void * __cdecl _lfind( const void *key, const void *base, unsigned int *nmemb, return NULL; } +/****************************************************************************** + * WinSqmEndSession (NTDLL.@) + */ +NTSTATUS WINAPI WinSqmEndSession(HANDLE session) +{ + FIXME("(%p): stub\n", session); + return STATUS_NOT_IMPLEMENTED; +} + /********************************************************************* * WinSqmIsOptedIn (NTDLL.@) */ BOOL WINAPI WinSqmIsOptedIn(void) { - FIXME("() stub\n"); + FIXME("(): stub\n"); return FALSE; } /****************************************************************************** + * WinSqmStartSession (NTDLL.@) + */ +HANDLE WINAPI WinSqmStartSession(GUID *sessionguid, DWORD sessionid, DWORD unknown1) +{ + FIXME("(%p, 0x%x, 0x%x): stub\n", sessionguid, sessionid, unknown1); + return INVALID_HANDLE_VALUE; +} + +/****************************************************************************** * EtwRegisterTraceGuidsW (NTDLL.@) * * Register an event trace provider and the event trace classes that it uses diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index a7256c4..4737b06 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1011,7 +1011,9 @@ @ stdcall TpWaitForWait(ptr long) @ stdcall TpWaitForWork(ptr long) @ stdcall -ret64 VerSetConditionMask(int64 long long) +@ stdcall WinSqmEndSession(long) @ stdcall WinSqmIsOptedIn() +@ stdcall WinSqmStartSession(ptr long long) @ stdcall ZwAcceptConnectPort(ptr long ptr long long ptr) NtAcceptConnectPort @ stdcall ZwAccessCheck(ptr long long ptr ptr ptr ptr ptr) NtAccessCheck @ stdcall ZwAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) NtAccessCheckAndAuditAlarm

1 0

Jump to page: