February 2014 - Wine-Commits

Ken Thomases : wined3d: Use a separate flag to track if the GL context needs to be made current.
by Alexandre Julliard Feb. 22, 2014

Feb. 22, 2014

Module: wine Branch: master Commit: baa85a097a48f0c88b1cbbf4e36bc81fde7496d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baa85a097a48f0c88b1cbbf4e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 19 16:14:04 2014 -0600 wined3d: Use a separate flag to track if the GL context needs to be made current. The new needs_set flag can be cleared after it's been heeded whereas restore_ctx must not be cleared until the context has been released back to level 0. --- dlls/wined3d/context.c | 5 ++++- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7d63ca3..9670d6e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -817,6 +817,7 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) ctx->valid = 1; } + ctx->needs_set = 0; return TRUE; } @@ -1080,6 +1081,7 @@ static void context_enter(struct wined3d_context *context) context->restore_ctx = current_gl; context->restore_dc = wglGetCurrentDC(); context->restore_pf = GetPixelFormat(context->restore_dc); + context->needs_set = 1; } } } @@ -1476,6 +1478,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, ret->win_handle = swapchain->win_handle; ret->hdc = hdc; ret->pixel_format = pixel_format; + ret->needs_set = 1; /* Set up the context defaults */ if (!context_set_current(ret)) @@ -3003,7 +3006,7 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, str if (!context_set_current(context)) ERR("Failed to activate the new context.\n"); } - else if (context->restore_ctx) + else if (context->needs_set) { context_set_gl_context(context); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9446bb8..29a76e2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1085,7 +1085,8 @@ struct wined3d_context DWORD fixed_function_usage_map : 8; /* MAX_TEXTURES, 8 */ DWORD lowest_disabled_stage : 4; /* Max MAX_TEXTURES, 8 */ DWORD rebind_fbo : 1; - DWORD padding : 19; + DWORD needs_set : 1; + DWORD padding : 18; DWORD shader_update_mask; DWORD constant_update_mask; DWORD numbered_array_mask;

1 0

Ken Thomases : wined3d: Remove redundant call to context_set_pixel_format( ) from context_update_window().
by Alexandre Julliard Feb. 22, 2014

Feb. 22, 2014

Module: wine Branch: master Commit: 2d1e67ee6848dd6b06beee44fdc167c9de811da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d1e67ee6848dd6b06beee44f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 19 16:13:48 2014 -0600 wined3d: Remove redundant call to context_set_pixel_format() from context_update_window(). It calls context_set_gl_context() just after and that starts with a call to context_set_pixel_format(). Also, context_update_window() didn't do the right thing (fall back to swapchain backup DC) if context_set_pixel_format() fails. --- dlls/wined3d/context.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6cd04ca..7d63ca3 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -858,13 +858,6 @@ static void context_update_window(struct wined3d_context *context) goto err; } - if (!context_set_pixel_format(context->gl_info, context->hdc, context->pixel_format)) - { - ERR("Failed to set pixel format %d on device context %p.\n", - context->pixel_format, context->hdc); - goto err; - } - context_set_gl_context(context); return;

1 0

Ken Thomases : wined3d: Make context_update_window() just mark the GL context as needing to be set rather than setting it.
by Alexandre Julliard Feb. 22, 2014

Feb. 22, 2014

Module: wine Branch: master Commit: b8569d2f3006bbb14b973eca15a608f9575a0ebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8569d2f3006bbb14b973eca1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 19 16:14:24 2014 -0600 wined3d: Make context_update_window() just mark the GL context as needing to be set rather than setting it. --- dlls/wined3d/context.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9670d6e..13eb415 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -852,6 +852,7 @@ static void context_update_window(struct wined3d_context *context) context->valid = 1; context->win_handle = context->swapchain->win_handle; + context->needs_set = 1; if (!(context->hdc = GetDC(context->win_handle))) { @@ -859,8 +860,6 @@ static void context_update_window(struct wined3d_context *context) goto err; } - context_set_gl_context(context); - return; err:

1 0

Dmitry Timoshkov : include: Fix typedef for TASK_RUNLEVEL_TYPE.
by Alexandre Julliard Feb. 22, 2014

Feb. 22, 2014

Module: wine Branch: master Commit: 02bd13dfdf086ea89499efa0925cd1ae1e6b71d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02bd13dfdf086ea89499efa09… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 21 11:35:10 2014 +0900 include: Fix typedef for TASK_RUNLEVEL_TYPE. --- include/taskschd.idl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/taskschd.idl b/include/taskschd.idl index 3b6bc2f..6b86a01 100644 --- a/include/taskschd.idl +++ b/include/taskschd.idl @@ -58,7 +58,7 @@ typedef enum _TASK_RUNLEVEL { TASK_RUNLEVEL_LUA, TASK_RUNLEVEL_HIGHEST -} TASK_RUNLEVEL; +} TASK_RUNLEVEL_TYPE; typedef enum _TASK_TRIGGER_TYPE2 { @@ -509,8 +509,8 @@ interface IPrincipal : IDispatch [propput] HRESULT LogonType([in] TASK_LOGON_TYPE logon); [propget] HRESULT GroupId([out, retval] BSTR *group); [propput] HRESULT GroupId([in] BSTR group); - [propget] HRESULT RunLevel([out, retval] TASK_RUNLEVEL *level); - [propput] HRESULT RunLevel([in] TASK_RUNLEVEL level); + [propget] HRESULT RunLevel([out, retval] TASK_RUNLEVEL_TYPE *level); + [propput] HRESULT RunLevel([in] TASK_RUNLEVEL_TYPE level); } [

1 0

Dmitry Timoshkov : taskschd: Add support for RegistrationInfo to task definition XML writer.
by Alexandre Julliard Feb. 22, 2014

Feb. 22, 2014

Module: wine Branch: master Commit: c6a01c42c970614d628d93a0a2bb6327b6e7a4d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a01c42c970614d628d93a0a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 21 11:35:30 2014 +0900 taskschd: Add support for RegistrationInfo to task definition XML writer. --- dlls/taskschd/task.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index e1fc713..002d25d 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1059,6 +1059,12 @@ static const WCHAR task_ns[] = {'h','t','t','p',':','/','/','s','c','h','e','m', static const WCHAR RegistrationInfo[] = {'R','e','g','i','s','t','r','a','t','i','o','n','I','n','f','o',0}; static const WCHAR Author[] = {'A','u','t','h','o','r',0}; static const WCHAR Description[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; +static const WCHAR Source[] = {'S','o','u','r','c','e',0}; +static const WCHAR Date[] = {'D','a','t','e',0}; +static const WCHAR Version[] = {'V','e','r','s','i','o','n',0}; +static const WCHAR Documentation[] = {'D','o','c','u','m','e','n','t','a','t','i','o','n',0}; +static const WCHAR URI[] = {'U','R','I',0}; +static const WCHAR SecurityDescriptor[] = {'S','e','c','u','r','i','t','y','D','e','s','c','r','i','p','t','o','r',0}; static const WCHAR Settings[] = {'S','e','t','t','i','n','g','s',0}; static const WCHAR Triggers[] = {'T','r','i','g','g','e','r','s',0}; static const WCHAR Principals[] = {'P','r','i','n','c','i','p','a','l','s',0}; @@ -1212,11 +1218,83 @@ static HRESULT write_task_attributes(IStream *stream, ITaskDefinition *taskdef) static HRESULT write_registration_info(IStream *stream, IRegistrationInfo *reginfo) { + HRESULT hr; + BSTR bstr; + VARIANT var; + if (!reginfo) return write_empty_element(stream, RegistrationInfo); - FIXME("stub\n"); - return S_OK; + hr = write_element(stream, RegistrationInfo); + if (hr != S_OK) return hr; + + push_indent(); + + hr = IRegistrationInfo_get_Source(reginfo, &bstr); + if (hr == S_OK) + { + hr = write_text_value(stream, Source, bstr); + SysFreeString(bstr); + if (hr != S_OK) return hr; + } + hr = IRegistrationInfo_get_Date(reginfo, &bstr); + if (hr == S_OK) + { + hr = write_text_value(stream, Date, bstr); + SysFreeString(bstr); + if (hr != S_OK) return hr; + } + hr = IRegistrationInfo_get_Author(reginfo, &bstr); + if (hr == S_OK) + { + hr = write_text_value(stream, Author, bstr); + SysFreeString(bstr); + if (hr != S_OK) return hr; + } + hr = IRegistrationInfo_get_Version(reginfo, &bstr); + if (hr == S_OK) + { + hr = write_text_value(stream, Version, bstr); + SysFreeString(bstr); + if (hr != S_OK) return hr; + } + hr = IRegistrationInfo_get_Description(reginfo, &bstr); + if (hr == S_OK) + { + hr = write_text_value(stream, Description, bstr); + SysFreeString(bstr); + if (hr != S_OK) return hr; + } + hr = IRegistrationInfo_get_Documentation(reginfo, &bstr); + if (hr == S_OK) + { + hr = write_text_value(stream, Documentation, bstr); + SysFreeString(bstr); + if (hr != S_OK) return hr; + } + hr = IRegistrationInfo_get_URI(reginfo, &bstr); + if (hr == S_OK) + { + hr = write_text_value(stream, URI, bstr); + SysFreeString(bstr); + if (hr != S_OK) return hr; + } + hr = IRegistrationInfo_get_SecurityDescriptor(reginfo, &var); + if (hr == S_OK) + { + if (V_VT(&var) == VT_BSTR) + { + hr = write_text_value(stream, SecurityDescriptor, V_BSTR(&var)); + VariantClear(&var); + if (hr != S_OK) return hr; + } + else + FIXME("SecurityInfo variant type %d is not supported\n", V_VT(&var)); + } + + pop_indent(); + + return write_element_end(stream, RegistrationInfo); } static HRESULT write_principal(IStream *stream, IPrincipal *principal)

1 0

Dmitry Timoshkov : taskschd: Add support for Principals to task definition XML writer.
by Alexandre Julliard Feb. 22, 2014

Feb. 22, 2014

Module: wine Branch: master Commit: 67ad1d85acb1ed4d471c6653ade36b91f8c18845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67ad1d85acb1ed4d471c6653a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 21 11:35:34 2014 +0900 taskschd: Add support for Principals to task definition XML writer. --- dlls/taskschd/task.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 117 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 002d25d..489ade3 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1072,6 +1072,11 @@ static const WCHAR Principal[] = {'P','r','i','n','c','i','p','a','l',0}; static const WCHAR id[] = {'i','d',0}; static const WCHAR UserId[] = {'U','s','e','r','I','d',0}; static const WCHAR LogonType[] = {'L','o','g','o','n','T','y','p','e',0}; +static const WCHAR GroupId[] = {'G','r','o','u','p','I','d',0}; +static const WCHAR DisplayName[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; +static const WCHAR HighestAvailable[] = {'H','i','g','h','e','s','t','A','v','a','i','l','a','b','l','e',0}; +static const WCHAR Password[] = {'P','a','s','s','w','o','r','d',0}; +static const WCHAR S4U[] = {'S','4','U',0}; static const WCHAR InteractiveToken[] = {'I','n','t','e','r','a','c','t','i','v','e','T','o','k','e','n',0}; static const WCHAR RunLevel[] = {'R','u','n','L','e','v','e','l',0}; static const WCHAR LeastPrivilege[] = {'L','e','a','s','t','P','r','i','v','i','l','e','g','e',0}; @@ -1123,6 +1128,9 @@ static const WCHAR start_end_element[] = {'<','/',0}; static const WCHAR close_element[] = {'>',0}; static const WCHAR end_empty_element[] = {'/','>',0}; static const WCHAR eol[] = {'\n',0}; +static const WCHAR spaceW[] = {' ',0}; +static const WCHAR equalW[] = {'=',0}; +static const WCHAR quoteW[] = {'"',0}; static inline HRESULT write_empty_element(IStream *stream, const WCHAR *name) { @@ -1166,9 +1174,6 @@ static inline HRESULT write_text_value(IStream *stream, const WCHAR *name, const static HRESULT write_task_attributes(IStream *stream, ITaskDefinition *taskdef) { - static const WCHAR spaceW[] = {' ',0}; - static const WCHAR equalW[] = {'=',0}; - static const WCHAR quoteW[] = {'"',0}; HRESULT hr; ITaskSettings *taskset; TASK_COMPATIBILITY level; @@ -1299,11 +1304,118 @@ static HRESULT write_registration_info(IStream *stream, IRegistrationInfo *regin static HRESULT write_principal(IStream *stream, IPrincipal *principal) { + HRESULT hr; + BSTR bstr; + TASK_LOGON_TYPE logon; + TASK_RUNLEVEL_TYPE level; + if (!principal) return write_empty_element(stream, Principals); - FIXME("stub\n"); - return S_OK; + hr = write_element(stream, Principals); + if (hr != S_OK) return hr; + + push_indent(); + + hr = IPrincipal_get_Id(principal, &bstr); + if (hr == S_OK) + { + write_indent(stream); + write_stringW(stream, start_element); + write_stringW(stream, Principal); + write_stringW(stream, spaceW); + write_stringW(stream, id); + write_stringW(stream, equalW); + write_stringW(stream, quoteW); + write_stringW(stream, bstr); + write_stringW(stream, quoteW); + write_stringW(stream, close_element); + write_stringW(stream, eol); + SysFreeString(bstr); + } + else + write_element(stream, Principal); + + push_indent(); + + hr = IPrincipal_get_GroupId(principal, &bstr); + if (hr == S_OK) + { + hr = write_text_value(stream, GroupId, bstr); + SysFreeString(bstr); + if (hr != S_OK) return hr; + } + hr = IPrincipal_get_DisplayName(principal, &bstr); + if (hr == S_OK) + { + hr = write_text_value(stream, DisplayName, bstr); + SysFreeString(bstr); + if (hr != S_OK) return hr; + } + hr = IPrincipal_get_UserId(principal, &bstr); + if (hr == S_OK && lstrlenW(bstr)) + { + hr = write_text_value(stream, UserId, bstr); + SysFreeString(bstr); + if (hr != S_OK) return hr; + } + hr = IPrincipal_get_RunLevel(principal, &level); + if (hr == S_OK) + { + const WCHAR *level_str = NULL; + + switch (level) + { + case TASK_RUNLEVEL_HIGHEST: + level_str = HighestAvailable; + break; + case TASK_RUNLEVEL_LUA: + level_str = LeastPrivilege; + break; + default: + FIXME("Principal run level %d\n", level); + break; + } + + if (level_str) + { + hr = write_text_value(stream, RunLevel, level_str); + if (hr != S_OK) return hr; + } + } + hr = IPrincipal_get_LogonType(principal, &logon); + if (hr == S_OK) + { + const WCHAR *logon_str = NULL; + + switch (logon) + { + case TASK_LOGON_PASSWORD: + logon_str = Password; + break; + case TASK_LOGON_S4U: + logon_str = S4U; + break; + case TASK_LOGON_INTERACTIVE_TOKEN: + logon_str = InteractiveToken; + break; + default: + FIXME("Principal logon type %d\n", logon); + break; + } + + if (logon_str) + { + hr = write_text_value(stream, LogonType, logon_str); + if (hr != S_OK) return hr; + } + } + + pop_indent(); + write_element_end(stream, Principal); + + pop_indent(); + return write_element_end(stream, Principals); } static HRESULT write_settings(IStream *stream, ITaskSettings *settings)

1 0

Dmitry Timoshkov : taskschd: ITaskService::NewTask doesn' t need a server connection.
by Alexandre Julliard Feb. 22, 2014

Feb. 22, 2014

Module: wine Branch: master Commit: 175dc763369cac2779f6dd4c407caeac9d08a712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=175dc763369cac2779f6dd4c4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 21 11:35:38 2014 +0900 taskschd: ITaskService::NewTask doesn't need a server connection. --- dlls/taskschd/task.c | 5 ----- dlls/taskschd/tests/scheduler.c | 3 --- 2 files changed, 8 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 489ade3..8b73bf0 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -2347,15 +2347,10 @@ static HRESULT WINAPI TaskService_GetRunningTasks(ITaskService *iface, LONG flag static HRESULT WINAPI TaskService_NewTask(ITaskService *iface, DWORD flags, ITaskDefinition **definition) { - TaskService *task_svc = impl_from_ITaskService(iface); - TRACE("%p,%x,%p\n", iface, flags, definition); if (!definition) return E_POINTER; - if (!task_svc->connected) - return HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED); - if (flags) FIXME("unsupported flags %x\n", flags); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 34e4625..35e6dc0 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1099,9 +1099,6 @@ static void test_TaskDefinition(void) V_VT(&v_null) = VT_NULL; - hr = ITaskService_Connect(service, v_null, v_null, v_null, v_null); - ok(hr == S_OK, "Connect error %#x\n", hr); - hr = ITaskService_NewTask(service, 0, &taskdef); ok(hr == S_OK, "NewTask error %#x\n", hr);

1 0

Aric Stewart : secur32: Return success on graceful close of SSL connection.
by Alexandre Julliard Feb. 22, 2014

Feb. 22, 2014

Module: wine Branch: master Commit: 3218cc077e1586bd2dcc3c10fa7cb03477dcc3c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3218cc077e1586bd2dcc3c10f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 21 07:37:56 2014 +0900 secur32: Return success on graceful close of SSL connection. --- dlls/secur32/schannel_macosx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 5d88223..7a29c7b 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -977,7 +977,7 @@ SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length); status = SSLRead(s->context, buffer, *length, length); - if (status == noErr) + if (status == noErr || status == errSSLClosedGraceful) TRACE("Read %lu bytes\n", *length); else if (status == errSSLWouldBlock) {

1 0

Kai Tietz : d3dx9core.h: Allow overriding D3DX_SDK_VERSION.
by Alexandre Julliard Feb. 22, 2014

Feb. 22, 2014

Module: wine Branch: master Commit: d7c4663df10f2d8606eeedfd4f53ed0485075052 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7c4663df10f2d8606eeedfd4… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Thu Feb 20 16:56:20 2014 +0100 d3dx9core.h: Allow overriding D3DX_SDK_VERSION. --- include/d3dx9core.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/d3dx9core.h b/include/d3dx9core.h index f91ffd4..5233317 100644 --- a/include/d3dx9core.h +++ b/include/d3dx9core.h @@ -27,7 +27,9 @@ /* D3DX_VERSION will be completely ignored since we are implementing all dlls from d3dx9_24 to d3dx9_36 */ #define D3DX_VERSION 0x0902 +#ifndef D3DX_SDK_VERSION #define D3DX_SDK_VERSION 36 +#endif #define D3DXSPRITE_DONOTSAVESTATE 0x00000001 #define D3DXSPRITE_DONOTMODIFY_RENDERSTATE 0x00000002 #define D3DXSPRITE_OBJECTSPACE 0x00000004

1 0

Kai Tietz : d3dx9shader.h: Added some missing declarations.
by Alexandre Julliard Feb. 22, 2014

Feb. 22, 2014

Module: wine Branch: master Commit: 6f41e98b61d97103e75934c3ae71e3585531194d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f41e98b61d97103e75934c3a… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Thu Feb 20 16:56:42 2014 +0100 d3dx9shader.h: Added some missing declarations. --- include/d3dx9shader.h | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index 2a083da..d665f72 100644 --- a/include/d3dx9shader.h +++ b/include/d3dx9shader.h @@ -1,5 +1,6 @@ /* * Copyright 2008 Luis Busquets + * Copyright 2014 Kai Tietz * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -42,7 +43,10 @@ #define D3DXSHADER_USE_LEGACY_D3DX9_31_DLL 0x10000 +#define D3DXCONSTTABLE_LARGEADDRESSAWARE 0x20000 + typedef const char *D3DXHANDLE; +typedef D3DXHANDLE *LPD3DXHANDLE; typedef enum _D3DXREGISTER_SET { @@ -112,7 +116,11 @@ typedef struct _D3DXCONSTANT_DESC const void *DefaultValue; } D3DXCONSTANT_DESC, *LPD3DXCONSTANT_DESC; +#if D3DX_SDK_VERSION < 43 DEFINE_GUID(IID_ID3DXConstantTable, 0x9dca3190, 0x38b9, 0x4fc3, 0x92, 0xe3, 0x39, 0xc6, 0xdd, 0xfb, 0x35, 0x8b); +#else +DEFINE_GUID(IID_ID3DXConstantTable, 0xab3c758f, 0x093e, 0x4356, 0xb7, 0x62, 0x4d, 0xb1, 0x8f, 0x1b, 0x3a, 0x01); +#endif #undef INTERFACE #define INTERFACE ID3DXConstantTable @@ -228,6 +236,42 @@ DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer) typedef struct ID3DXConstantTable *LPD3DXCONSTANTTABLE; +typedef interface ID3DXTextureShader *LPD3DXTEXTURESHADER; + +DEFINE_GUID(IID_ID3DXTextureShader, 0x3e3d67f8, 0xaa7a, 0x405d, 0xa8, 0x57, 0xba, 0x1, 0xd4, 0x75, 0x84, 0x26); + +#define INTERFACE ID3DXTextureShader +DECLARE_INTERFACE_(ID3DXTextureShader, IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + STDMETHOD(GetFunction)(THIS_ struct ID3DXBuffer **ppFunction) PURE; + STDMETHOD(GetConstantBuffer)(THIS_ struct ID3DXBuffer **ppConstantBuffer) PURE; + STDMETHOD(GetDesc)(THIS_ D3DXCONSTANTTABLE_DESC *pDesc) PURE; + STDMETHOD(GetConstantDesc)(THIS_ D3DXHANDLE hConstant, D3DXCONSTANT_DESC *pConstantDesc, UINT *pCount) PURE; + STDMETHOD_(D3DXHANDLE, GetConstant)(THIS_ D3DXHANDLE hConstant, UINT Index) PURE; + STDMETHOD_(D3DXHANDLE, GetConstantByName)(THIS_ D3DXHANDLE hConstant, const char *pName) PURE; + STDMETHOD_(D3DXHANDLE, GetConstantElement)(THIS_ D3DXHANDLE hConstant, UINT Index) PURE; + STDMETHOD(SetDefaults)(THIS) PURE; + STDMETHOD(SetValue)(THIS_ D3DXHANDLE hConstant, const void *pData, UINT Bytes) PURE; + STDMETHOD(SetBool)(THIS_ D3DXHANDLE hConstant, BOOL b) PURE; + STDMETHOD(SetBoolArray)(THIS_ D3DXHANDLE hConstant, const BOOL *pb, UINT Count) PURE; + STDMETHOD(SetInt)(THIS_ D3DXHANDLE hConstant, INT n) PURE; + STDMETHOD(SetIntArray)(THIS_ D3DXHANDLE hConstant, const INT *pn, UINT Count) PURE; + STDMETHOD(SetFloat)(THIS_ D3DXHANDLE hConstant, FLOAT f) PURE; + STDMETHOD(SetFloatArray)(THIS_ D3DXHANDLE hConstant, const FLOAT *pf, UINT Count) PURE; + STDMETHOD(SetVector)(THIS_ D3DXHANDLE hConstant, const D3DXVECTOR4 *pVector) PURE; + STDMETHOD(SetVectorArray)(THIS_ D3DXHANDLE hConstant, const D3DXVECTOR4 *pVector, UINT Count) PURE; + STDMETHOD(SetMatrix)(THIS_ D3DXHANDLE hConstant, const D3DXMATRIX *pMatrix) PURE; + STDMETHOD(SetMatrixArray)(THIS_ D3DXHANDLE hConstant, const D3DXMATRIX *pMatrix, UINT Count) PURE; + STDMETHOD(SetMatrixPointerArray)(THIS_ D3DXHANDLE hConstant, const D3DXMATRIX **ppMatrix, UINT Count) PURE; + STDMETHOD(SetMatrixTranspose)(THIS_ D3DXHANDLE hConstant, const D3DXMATRIX *pMatrix) PURE; + STDMETHOD(SetMatrixTransposeArray)(THIS_ D3DXHANDLE hConstant, const D3DXMATRIX *pMatrix, UINT Count) PURE; + STDMETHOD(SetMatrixTransposePointerArray)(THIS_ D3DXHANDLE hConstant, const D3DXMATRIX **ppMatrix, UINT Count) PURE; +}; +#undef INTERFACE + typedef struct _D3DXMACRO { const char *Name; @@ -291,6 +335,8 @@ HRESULT WINAPI D3DXCompileShader(const char *src_data, UINT data_len, const D3DX ID3DXInclude *include, const char *function_name, const char *profile, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages, ID3DXConstantTable **constant_table); +HRESULT WINAPI D3DXDisassembleShader(const DWORD *pShader, BOOL EnableColorCode, const char *pComments, struct ID3DXBuffer **ppDisassembly); + HRESULT WINAPI D3DXCompileShaderFromFileA(const char *filename, const D3DXMACRO *defines, ID3DXInclude *include, const char *entrypoint, const char *profile, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages, ID3DXConstantTable **constant_table); @@ -326,6 +372,11 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, HRESULT WINAPI D3DXGetShaderConstantTable(const DWORD *byte_code, ID3DXConstantTable **constant_table); +HRESULT WINAPI D3DXGetShaderInputSemantics(const DWORD *pFunction, D3DXSEMANTIC *pSemantics, UINT *pCount); +HRESULT WINAPI D3DXGetShaderOutputSemantics(const DWORD *pFunction, D3DXSEMANTIC *pSemantics, UINT *pCount); + +HRESULT WINAPI D3DXCreateTextureShader(const DWORD *pFunction, ID3DXTextureShader **ppTextureShader); + #ifdef __cplusplus } #endif

1 0