October 2009 - Wine-commits

Alexandre Julliard : user32: Specify the full application path when starting builtin apps.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 5950c6af807da53fa80c53cbb308901df45fbc8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5950c6af807da53fa80c53cbb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 11:22:38 2009 +0100 user32: Specify the full application path when starting builtin apps. --- dlls/user32/user_main.c | 8 +++++--- dlls/user32/win.c | 20 ++++++++++++-------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 516338c..ce55ff7 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -354,12 +354,14 @@ BOOL WINAPI ExitWindowsEx( UINT flags, DWORD reason ) static const WCHAR forceW[] = { ' ','-','-','f','o','r','c','e',0 }; static const WCHAR shutdownW[] = { ' ','-','-','s','h','u','t','d','o','w','n',0 }; + WCHAR app[MAX_PATH]; WCHAR cmdline[MAX_PATH + 64]; PROCESS_INFORMATION pi; STARTUPINFOW si; - GetSystemDirectoryW( cmdline, MAX_PATH ); - lstrcatW( cmdline, winebootW ); + GetSystemDirectoryW( app, MAX_PATH - sizeof(winebootW)/sizeof(WCHAR) ); + strcatW( app, winebootW ); + strcpyW( cmdline, app ); if (flags & EWX_FORCE) lstrcatW( cmdline, killW ); else @@ -371,7 +373,7 @@ BOOL WINAPI ExitWindowsEx( UINT flags, DWORD reason ) memset( &si, 0, sizeof si ); si.cb = sizeof si; - if (!CreateProcessW( NULL, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi )) + if (!CreateProcessW( app, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi )) { ERR( "Failed to run %s\n", debugstr_w(cmdline) ); return FALSE; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d6746b0..9e42ff8 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1852,11 +1852,13 @@ HWND WINAPI GetDesktopWindow(void) if (!GetUserObjectInformationW( GetProcessWindowStation(), UOI_FLAGS, &flags, sizeof(flags), NULL ) || (flags.dwFlags & WSF_VISIBLE)) { - static const WCHAR command_line[] = {'\\','e','x','p','l','o','r','e','r','.','e','x','e',' ','/','d','e','s','k','t','o','p',0}; + static const WCHAR explorer[] = {'\\','e','x','p','l','o','r','e','r','.','e','x','e',0}; + static const WCHAR args[] = {' ','/','d','e','s','k','t','o','p',0}; STARTUPINFOW si; PROCESS_INFORMATION pi; - WCHAR systemdir[MAX_PATH]; - WCHAR cmdline[MAX_PATH + sizeof(command_line)/sizeof(WCHAR)]; + WCHAR windir[MAX_PATH]; + WCHAR app[MAX_PATH + sizeof(explorer)/sizeof(WCHAR)]; + WCHAR cmdline[MAX_PATH + (sizeof(explorer) + sizeof(args))/sizeof(WCHAR)]; memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); @@ -1865,11 +1867,13 @@ HWND WINAPI GetDesktopWindow(void) si.hStdOutput = 0; si.hStdError = GetStdHandle( STD_ERROR_HANDLE ); - GetSystemDirectoryW( systemdir, MAX_PATH ); - lstrcpyW( cmdline, systemdir ); - lstrcatW( cmdline, command_line ); - if (CreateProcessW( NULL, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, - NULL, systemdir, &si, &pi )) + GetWindowsDirectoryW( windir, MAX_PATH ); + strcpyW( app, windir ); + strcatW( app, explorer ); + strcpyW( cmdline, app ); + strcatW( cmdline, args ); + if (CreateProcessW( app, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, + NULL, windir, &si, &pi )) { TRACE( "started explorer pid %04x tid %04x\n", pi.dwProcessId, pi.dwThreadId ); WaitForInputIdle( pi.hProcess, 10000 );

1 0

Alexandre Julliard : explorer: Specify the full application path when starting winefile.exe.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 781fcd469169a4ad48ebd06d9d32d8360acd3be4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=781fcd469169a4ad48ebd06d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 11:22:51 2009 +0100 explorer: Specify the full application path when starting winefile.exe. --- programs/explorer/explorer.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index c8c3ea0..16dcf72 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -151,6 +151,7 @@ int WINAPI wWinMain(HINSTANCE hinstance, BOOL rc; static const WCHAR winefile[] = {'\\','w','i','n','e','f','i','l','e','.','e','x','e',0}; static const WCHAR space[] = {' ',0}; + WCHAR app[MAX_PATH]; LPWSTR winefile_commandline = NULL; DWORD len = 0; @@ -164,8 +165,9 @@ int WINAPI wWinMain(HINSTANCE hinstance, else if (parameters.root[0]) len += lstrlenW(parameters.root) + 3; winefile_commandline = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); - GetSystemDirectoryW( winefile_commandline, len ); - lstrcatW(winefile_commandline,winefile); + GetSystemDirectoryW( app, MAX_PATH - sizeof(winefile)/sizeof(WCHAR) ); + strcatW( app, winefile ); + strcpyW( winefile_commandline, app ); if (parameters.selection[0]) { @@ -183,7 +185,7 @@ int WINAPI wWinMain(HINSTANCE hinstance, } } - rc = CreateProcessW(NULL, winefile_commandline, NULL, NULL, FALSE, 0, NULL, + rc = CreateProcessW(app, winefile_commandline, NULL, NULL, FALSE, 0, NULL, parameters.root[0] ? parameters.root:NULL, &si, &info); HeapFree(GetProcessHeap(),0,winefile_commandline);

1 0

Alexandre Julliard : oleview: Specify the full application path when starting regedit.exe.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 315b529982e4534803b2900b683533b0368f7200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=315b529982e4534803b2900b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 11:23:00 2009 +0100 oleview: Specify the full application path when starting regedit.exe. --- programs/oleview/oleview.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 5f0fdc5..f67c75d 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -21,7 +21,7 @@ #include "main.h" GLOBALS globals; -static WCHAR wszRegEdit[] = { 'r','e','g','e','d','i','t','.','e','x','e','\0' }; +static const WCHAR wszRegEdit[] = { '\\','r','e','g','e','d','i','t','.','e','x','e','\0' }; static WCHAR wszFormat[] = { '<','o','b','j','e','c','t','\n',' ',' ',' ', 'c','l','a','s','s','i','d','=','\"','c','l','s','i','d',':','%','s','\"','\n', '>','\n','<','/','o','b','j','e','c','t','>','\0' }; @@ -370,13 +370,17 @@ static int MenuCommand(WPARAM wParam, HWND hWnd) { STARTUPINFO si; PROCESS_INFORMATION pi; + WCHAR app[MAX_PATH]; + GetWindowsDirectoryW( app, MAX_PATH - sizeof(wszRegEdit)/sizeof(WCHAR) ); + lstrcatW( app, wszRegEdit ); memset(&si, 0, sizeof(si)); si.cb = sizeof(si); - CreateProcess(NULL, wszRegEdit, NULL, NULL, FALSE, 0, - NULL, NULL, &si, &pi); - CloseHandle(pi.hProcess); - CloseHandle(pi.hThread); + if (CreateProcess(app, app, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } break; } case IDM_STATUSBAR:

1 0

Alexandre Julliard : shdocvw: Specify the full path to iexplore.exe.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 99dd3484227c606c2c02469691db301f85d476d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99dd3484227c606c2c0246969… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 11:25:39 2009 +0100 shdocvw: Specify the full path to iexplore.exe. --- dlls/shdocvw/shdocvw.inf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/shdocvw.inf b/dlls/shdocvw/shdocvw.inf index 92e7884..9baa8c8 100644 --- a/dlls/shdocvw/shdocvw.inf +++ b/dlls/shdocvw/shdocvw.inf @@ -20,7 +20,7 @@ DelReg=IE.Reg, Settings.Reg [Classes.Reg] HKCR,"CLSID\%CLSID_InternetExplorer%",,,"Internet Explorer(Ver 1.0)" -HKCR,"CLSID\%CLSID_InternetExplorer%\LocalServer32",,,"iexplore.exe" +HKCR,"CLSID\%CLSID_InternetExplorer%\LocalServer32",,,"""%16422%\Internet Explorer\iexplore.exe""" HKCR,"CLSID\%CLSID_InternetExplorer%\ProgID",,,"InternetExplorer.Application.1" HKCR,"CLSID\%CLSID_InternetExplorer%\VersionIndependentProgID",,,"InternetExplorer.Application" HKCR,"InternetExplorer.Application",,,"Internet Explorer(Ver 1.0)"

1 0

Alexandre Julliard : wine.inf: Specify the full path to iexplore. exe and winemenubuiler.exe.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: dbfe34eceb848d82eb4bacafe2e23fe2738bfdb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbfe34eceb848d82eb4bacafe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 11:25:50 2009 +0100 wine.inf: Specify the full path to iexplore.exe and winemenubuiler.exe. --- tools/wine.inf.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index ceccec5..bb2bd45 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -400,7 +400,7 @@ HKLM,%CurrentVersion%,"RegisteredOwner",2,"" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"DiskSpinDownMax",,"3600" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"DiskSpinDownMin",,"3" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"LastID",,"5" -HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"winemenubuilder -a -r" +HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,%CurrentVersion%\Setup,"BootDir",,"%30%" HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" HKLM,%CurrentVersion%\Uninstall,,,"" @@ -2402,7 +2402,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,hhctrl.ocx,1 11,,hlink.dll,1 11,,hnetcfg.dll,1 -11,,iexplore.exe,1 11,,inetcomm.dll,1 11,,infosoft.dll,1 11,,inseng.dll,1 @@ -2434,6 +2433,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,wintrust.dll,1 11,,wmiutils.dll,1 11,,wuapi.dll,1 +16422,Internet Explorer,iexplore.exe,1 [FakeDllsSection] ; create some directories first

1 0

Alexandre Julliard : setupapi: Create fake dlls before performing dll registration.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 4ae262df8efbcf4cd2e213a1899801c09d6b5047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae262df8efbcf4cd2e213a18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 11:26:12 2009 +0100 setupapi: Create fake dlls before performing dll registration. --- dlls/setupapi/install.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 293f977..49b61d9 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1082,10 +1082,10 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, } else info.callback = NULL; - if (!iterate_section_fields( hinf, section, RegisterDlls, register_dlls_callback, &info )) + if (!iterate_section_fields( hinf, section, WineFakeDlls, fake_dlls_callback, NULL )) return FALSE; - if (!iterate_section_fields( hinf, section, WineFakeDlls, fake_dlls_callback, NULL )) + if (!iterate_section_fields( hinf, section, RegisterDlls, register_dlls_callback, &info )) return FALSE; } if (flags & SPINST_UNREGSVR)

1 0

Rico Schüller : d3d10: Implement ID3D10Effect:: GetVariableByIndex().
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 135966f22ed7712a4c4b56db735adcb9cd851525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=135966f22ed7712a4c4b56db7… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Oct 26 18:38:13 2009 +0100 d3d10: Implement ID3D10Effect::GetVariableByIndex(). --- dlls/d3d10/effect.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index def2c1a..a6159b7 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1749,9 +1749,36 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetCon static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableByIndex(ID3D10Effect *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); + struct d3d10_effect *This = (struct d3d10_effect *)iface; + unsigned int i; - return NULL; + TRACE("iface %p, index %u\n", iface, index); + + for (i = 0; i < This->local_buffer_count; ++i) + { + struct d3d10_effect_variable *l = &This->local_buffers[i]; + + if (index < l->type->member_count) + { + struct d3d10_effect_variable *v = &l->members[index]; + + TRACE("Returning variable %p.\n", v); + return (ID3D10EffectVariable *)v; + } + index -= l->type->member_count; + } + + if (index < This->local_variable_count) + { + struct d3d10_effect_variable *v = &This->local_variables[index]; + + TRACE("Returning variable %p.\n", v); + return (ID3D10EffectVariable *)v; + } + + WARN("Invalid index specified\n"); + + return (ID3D10EffectVariable *)&null_variable; } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableByName(ID3D10Effect *iface, LPCSTR name)

1 0

Rico Schüller : d3d10: Improve ID3D10Effect:: GetVariableByName().
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: b66733aabb1295f2d9b17c63d65bb946cc9d391c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b66733aabb1295f2d9b17c63d… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Oct 26 18:38:21 2009 +0100 d3d10: Improve ID3D10Effect::GetVariableByName(). --- dlls/d3d10/effect.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index a6159b7..1d41f53 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1805,6 +1805,17 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB } } + for (i = 0; i < This->local_variable_count; ++i) + { + struct d3d10_effect_variable *v = &This->local_variables[i]; + + if (!strcmp(v->name, name)) + { + TRACE("Returning variable %p.\n", v); + return (ID3D10EffectVariable *)v; + } + } + WARN("Invalid name specified\n"); return (ID3D10EffectVariable *)&null_variable;

1 0

Rico Schüller : d3d10: Add ID3D10EffectBlendVariableVtbl.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 1b0404f69e53ffc79e765ce4b8993cfeedb3bda6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b0404f69e53ffc79e765ce4b… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Oct 26 18:38:31 2009 +0100 d3d10: Add ID3D10EffectBlendVariableVtbl. --- dlls/d3d10/effect.c | 211 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 211 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 1d41f53..2d3e3f2 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -52,6 +52,7 @@ static const struct ID3D10EffectConstantBufferVtbl d3d10_effect_constant_buffer_ static const struct ID3D10EffectScalarVariableVtbl d3d10_effect_scalar_variable_vtbl; static const struct ID3D10EffectVectorVariableVtbl d3d10_effect_vector_variable_vtbl; static const struct ID3D10EffectMatrixVariableVtbl d3d10_effect_matrix_variable_vtbl; +static const struct ID3D10EffectBlendVariableVtbl d3d10_effect_blend_variable_vtbl; static const struct ID3D10EffectTypeVtbl d3d10_effect_type_vtbl; /* null objects - needed for invalid calls */ @@ -76,6 +77,9 @@ static struct d3d10_effect_variable null_vector_variable = static struct d3d10_effect_variable null_matrix_variable = {(ID3D10EffectVariableVtbl *)&d3d10_effect_matrix_variable_vtbl, &null_local_buffer, NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; +static struct d3d10_effect_variable null_blend_variable = + {(ID3D10EffectVariableVtbl *)&d3d10_effect_blend_variable_vtbl, &null_local_buffer, + NULL, NULL, NULL, 0, 0, 0, 0, &null_type, NULL, NULL, NULL}; static struct d3d10_effect_type *get_fx10_type(struct d3d10_effect *effect, const char *data, DWORD offset); @@ -3653,6 +3657,213 @@ static const struct ID3D10EffectMatrixVariableVtbl d3d10_effect_matrix_variable_ d3d10_effect_matrix_variable_GetMatrixTransposeArray, }; +/* ID3D10EffectVariable methods */ + +static BOOL STDMETHODCALLTYPE d3d10_effect_blend_variable_IsValid(ID3D10EffectBlendVariable *iface) +{ + TRACE("iface %p\n", iface); + + return (struct d3d10_effect_variable *)iface != &null_blend_variable; +} + +static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_blend_variable_GetType( + ID3D10EffectBlendVariable *iface) +{ + return d3d10_effect_variable_GetType((ID3D10EffectVariable *)iface); +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_blend_variable_GetDesc(ID3D10EffectBlendVariable *iface, + D3D10_EFFECT_VARIABLE_DESC *desc) +{ + return d3d10_effect_variable_GetDesc((ID3D10EffectVariable *)iface, desc); +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_blend_variable_GetAnnotationByIndex( + ID3D10EffectBlendVariable *iface, UINT index) +{ + return d3d10_effect_variable_GetAnnotationByIndex((ID3D10EffectVariable *)iface, index); +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_blend_variable_GetAnnotationByName( + ID3D10EffectBlendVariable *iface, LPCSTR name) +{ + return d3d10_effect_variable_GetAnnotationByName((ID3D10EffectVariable *)iface, name); +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_blend_variable_GetMemberByIndex( + ID3D10EffectBlendVariable *iface, UINT index) +{ + return d3d10_effect_variable_GetMemberByIndex((ID3D10EffectVariable *)iface, index); +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_blend_variable_GetMemberByName( + ID3D10EffectBlendVariable *iface, LPCSTR name) +{ + return d3d10_effect_variable_GetMemberByName((ID3D10EffectVariable *)iface, name); +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_blend_variable_GetMemberBySemantic( + ID3D10EffectBlendVariable *iface, LPCSTR semantic) +{ + return d3d10_effect_variable_GetMemberBySemantic((ID3D10EffectVariable *)iface, semantic); +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_blend_variable_GetElement( + ID3D10EffectBlendVariable *iface, UINT index) +{ + return d3d10_effect_variable_GetElement((ID3D10EffectVariable *)iface, index); +} + +static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_blend_variable_GetParentConstantBuffer( + ID3D10EffectBlendVariable *iface) +{ + return d3d10_effect_variable_GetParentConstantBuffer((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectScalarVariable * STDMETHODCALLTYPE d3d10_effect_blend_variable_AsScalar( + ID3D10EffectBlendVariable *iface) +{ + return d3d10_effect_variable_AsScalar((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectVectorVariable * STDMETHODCALLTYPE d3d10_effect_blend_variable_AsVector( + ID3D10EffectBlendVariable *iface) +{ + return d3d10_effect_variable_AsVector((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectMatrixVariable * STDMETHODCALLTYPE d3d10_effect_blend_variable_AsMatrix( + ID3D10EffectBlendVariable *iface) +{ + return d3d10_effect_variable_AsMatrix((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectStringVariable * STDMETHODCALLTYPE d3d10_effect_blend_variable_AsString( + ID3D10EffectBlendVariable *iface) +{ + return d3d10_effect_variable_AsString((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectShaderResourceVariable * STDMETHODCALLTYPE d3d10_effect_blend_variable_AsShaderResource( + ID3D10EffectBlendVariable *iface) +{ + return d3d10_effect_variable_AsShaderResource((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectRenderTargetViewVariable * STDMETHODCALLTYPE d3d10_effect_blend_variable_AsRenderTargetView( + ID3D10EffectBlendVariable *iface) +{ + return d3d10_effect_variable_AsRenderTargetView((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectDepthStencilViewVariable * STDMETHODCALLTYPE d3d10_effect_blend_variable_AsDepthStencilView( + ID3D10EffectBlendVariable *iface) +{ + return d3d10_effect_variable_AsDepthStencilView((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_blend_variable_AsConstantBuffer( + ID3D10EffectBlendVariable *iface) +{ + return d3d10_effect_variable_AsConstantBuffer((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectShaderVariable * STDMETHODCALLTYPE d3d10_effect_blend_variable_AsShader( + ID3D10EffectBlendVariable *iface) +{ + return d3d10_effect_variable_AsShader((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectBlendVariable * STDMETHODCALLTYPE d3d10_effect_blend_variable_AsBlend( + ID3D10EffectBlendVariable *iface) +{ + return d3d10_effect_variable_AsBlend((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectDepthStencilVariable * STDMETHODCALLTYPE d3d10_effect_blend_variable_AsDepthStencil( + ID3D10EffectBlendVariable *iface) +{ + return d3d10_effect_variable_AsDepthStencil((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectRasterizerVariable * STDMETHODCALLTYPE d3d10_effect_blend_variable_AsRasterizer( + ID3D10EffectBlendVariable *iface) +{ + return d3d10_effect_variable_AsRasterizer((ID3D10EffectVariable *)iface); +} + +static struct ID3D10EffectSamplerVariable * STDMETHODCALLTYPE d3d10_effect_blend_variable_AsSampler( + ID3D10EffectBlendVariable *iface) +{ + return d3d10_effect_variable_AsSampler((ID3D10EffectVariable *)iface); +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_blend_variable_SetRawValue(ID3D10EffectBlendVariable *iface, + void *data, UINT offset, UINT count) +{ + return d3d10_effect_variable_SetRawValue((ID3D10EffectVariable *)iface, data, offset, count); +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_blend_variable_GetRawValue(ID3D10EffectBlendVariable *iface, + void *data, UINT offset, UINT count) +{ + return d3d10_effect_variable_GetRawValue((ID3D10EffectVariable *)iface, data, offset, count); +} + +/* ID3D10EffectBlendVariable methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_effect_blend_variable_GetBlendState(ID3D10EffectBlendVariable *iface, + UINT index, ID3D10BlendState **blend_state) +{ + FIXME("iface %p, index %u, blend_state %p stub!\n", iface, index, blend_state); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_blend_variable_GetBackingStore(ID3D10EffectBlendVariable *iface, + UINT index, D3D10_BLEND_DESC *desc) +{ + FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + + return E_NOTIMPL; +} + + +static const struct ID3D10EffectBlendVariableVtbl d3d10_effect_blend_variable_vtbl = +{ + /* ID3D10EffectVariable methods */ + d3d10_effect_blend_variable_IsValid, + d3d10_effect_blend_variable_GetType, + d3d10_effect_blend_variable_GetDesc, + d3d10_effect_blend_variable_GetAnnotationByIndex, + d3d10_effect_blend_variable_GetAnnotationByName, + d3d10_effect_blend_variable_GetMemberByIndex, + d3d10_effect_blend_variable_GetMemberByName, + d3d10_effect_blend_variable_GetMemberBySemantic, + d3d10_effect_blend_variable_GetElement, + d3d10_effect_blend_variable_GetParentConstantBuffer, + d3d10_effect_blend_variable_AsScalar, + d3d10_effect_blend_variable_AsVector, + d3d10_effect_blend_variable_AsMatrix, + d3d10_effect_blend_variable_AsString, + d3d10_effect_blend_variable_AsShaderResource, + d3d10_effect_blend_variable_AsRenderTargetView, + d3d10_effect_blend_variable_AsDepthStencilView, + d3d10_effect_blend_variable_AsConstantBuffer, + d3d10_effect_blend_variable_AsShader, + d3d10_effect_blend_variable_AsBlend, + d3d10_effect_blend_variable_AsDepthStencil, + d3d10_effect_blend_variable_AsRasterizer, + d3d10_effect_blend_variable_AsSampler, + d3d10_effect_blend_variable_SetRawValue, + d3d10_effect_blend_variable_GetRawValue, + /* ID3D10EffectBlendVariable methods */ + d3d10_effect_blend_variable_GetBlendState, + d3d10_effect_blend_variable_GetBackingStore, +}; + +/* ID3D10EffectType methods */ + static BOOL STDMETHODCALLTYPE d3d10_effect_type_IsValid(ID3D10EffectType *iface) { FIXME("iface %p stub!\n", iface);

1 0

Rico Schüller : d3d10: Add ID3D10EffectDepthStencilVariableVtbl.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 3000abae9b4f31305247982a4e52441277058a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3000abae9b4f31305247982a4… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Oct 26 18:38:46 2009 +0100 d3d10: Add ID3D10EffectDepthStencilVariableVtbl. --- dlls/d3d10/effect.c | 209 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 209 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3000abae9b4f313052479…

1 0