November 2015 - Wine-Commits

Jacek Caban : advapi32: Added DECLSPEC_HOTPATCHABLE to CreateProcessAsUser [AW] functions.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: fdc6f610c38f2ce2c5abfd408680b383e8a27de2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdc6f610c38f2ce2c5abfd408… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 16:01:24 2015 +0100 advapi32: Added DECLSPEC_HOTPATCHABLE to CreateProcessAsUser[AW] functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index a64ebf9..09dfdec 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -19,6 +19,8 @@ * */ +#include "config.h" + #include <stdarg.h> #include <string.h> @@ -5312,7 +5314,7 @@ BOOL WINAPI DestroyPrivateObjectSecurity( PSECURITY_DESCRIPTOR* ObjectDescriptor return TRUE; } -BOOL WINAPI CreateProcessAsUserA( +BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessAsUserA( HANDLE hToken, LPCSTR lpApplicationName, LPSTR lpCommandLine, @@ -5367,7 +5369,7 @@ BOOL WINAPI CreateProcessAsUserA( return ret; } -BOOL WINAPI CreateProcessAsUserW( +BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessAsUserW( HANDLE hToken, LPCWSTR lpApplicationName, LPWSTR lpCommandLine,

1 0

Jacek Caban : ole32: Added DECLSPEC_HOTPATCHABLE to a few more functions.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: 80c53b33fd0145e94ab92201e4071cb847aa4964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80c53b33fd0145e94ab92201e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 15:58:07 2015 +0100 ole32: Added DECLSPEC_HOTPATCHABLE to a few more functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 4 ++-- dlls/ole32/ole2.c | 4 ++-- dlls/ole32/ole2stubs.c | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index ffa5dae..522f66b 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1025,7 +1025,7 @@ static HRESULT get_local_server_stream(APARTMENT *apt, IStream **ret) * SEE ALSO * CoRegisterClassObject */ -HRESULT WINAPI CoRevokeClassObject( +HRESULT WINAPI DECLSPEC_HOTPATCH CoRevokeClassObject( DWORD dwRegister) { HRESULT hr = E_INVALIDARG; @@ -3326,7 +3326,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( /*********************************************************************** * CoGetInstanceFromFile [OLE32.@] */ -HRESULT WINAPI CoGetInstanceFromFile( +HRESULT WINAPI DECLSPEC_HOTPATCH CoGetInstanceFromFile( COSERVERINFO *server_info, CLSID *rclsid, IUnknown *outer, diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 40f7238..40cb5b9 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -171,7 +171,7 @@ DWORD WINAPI OleBuildVersion(void) /*********************************************************************** * OleInitialize (OLE32.@) */ -HRESULT WINAPI OleInitialize(LPVOID reserved) +HRESULT WINAPI DECLSPEC_HOTPATCH OleInitialize(LPVOID reserved) { HRESULT hr; @@ -1235,7 +1235,7 @@ HRESULT WINAPI OleSetContainedObject( * Success: S_OK. * Failure: Any HRESULT code. */ -HRESULT WINAPI OleRun(LPUNKNOWN pUnknown) +HRESULT WINAPI DECLSPEC_HOTPATCH OleRun(LPUNKNOWN pUnknown) { IRunnableObject *runable; HRESULT hres; diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c index de35747..1f8b9f8 100644 --- a/dlls/ole32/ole2stubs.c +++ b/dlls/ole32/ole2stubs.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> #include "windef.h" @@ -63,7 +65,7 @@ HGLOBAL WINAPI OleGetIconOfClass(REFCLSID rclsid, LPOLESTR lpszLabel, BOOL fUseT /*********************************************************************** * OleRegEnumFormatEtc [OLE32.@] */ -HRESULT WINAPI OleRegEnumFormatEtc ( +HRESULT WINAPI DECLSPEC_HOTPATCH OleRegEnumFormatEtc ( REFCLSID clsid, DWORD dwDirection, LPENUMFORMATETC* ppenumFormatetc)

1 0

Alexandre Julliard : makefiles: Generate rules for installing wine.inf.
by Alexandre Julliard Nov. 13, 2015

Nov. 13, 2015

Module: wine Branch: master Commit: b8d138d633b63040880be6ca97cadc95c036703c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d138d633b63040880be6ca9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 15:16:16 2015 +0900 makefiles: Generate rules for installing wine.inf. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 16 +++++++++------- configure.ac | 16 +++++++++------- tools/makedep.c | 2 ++ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 51a6913..0aa17fc 100755 --- a/configure +++ b/configure @@ -7865,6 +7865,7 @@ distclean:: wine_binary="wine" test "x$enable_win64" != "xyes" || wine_binary="wine64" loader_programs="$wine_binary" +loader_install="" libwine_soversion=`expr $libwine_version : '$[0-9]*$\..*'` case $host_os in @@ -14979,10 +14980,6 @@ ${wine_binary}_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Tte esac ;; esac -as_fn_append LOADER_RULES " -PROGRAMS = $loader_programs -INSTALL_LIB = $loader_programs -" ac_save_CFLAGS="$CFLAGS" @@ -18321,16 +18318,21 @@ $with_wine64/loader/wine-preloader: clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader" else + loader_install="$loader_install wine.inf" as_fn_append LOADER_RULES " -install install-lib:: wine.inf - \$(INSTALL_DATA) wine.inf \$(DESTDIR)\$(datadir)/wine/wine.inf +install install-lib:: \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/wine.inf \$(DESTDIR)\$(datadir)/wine/l_intl.nls + \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls " fi +as_fn_append LOADER_RULES " +PROGRAMS = $loader_programs +INSTALL_LIB = $loader_programs$loader_install +" + if test "$srcdir" = . then ac_config_commands="$ac_config_commands .gitignore" diff --git a/configure.ac b/configure.ac index 4e9ca89..685b346 100644 --- a/configure.ac +++ b/configure.ac @@ -688,6 +688,7 @@ WINE_CONFIG_HELPERS wine_binary="wine" test "x$enable_win64" != "xyes" || wine_binary="wine64" loader_programs="$wine_binary" +loader_install="" libwine_soversion=`expr $libwine_version : '$[[0-9]]*$\..*'` case $host_os in @@ -1981,10 +1982,6 @@ ${wine_binary}_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Tte esac ;; esac -AS_VAR_APPEND([LOADER_RULES],[" -PROGRAMS = $loader_programs -INSTALL_LIB = $loader_programs -"]) dnl **** Check for functions **** @@ -3694,16 +3691,21 @@ $with_wine64/loader/wine-preloader: clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) else + loader_install="$loader_install wine.inf" AS_VAR_APPEND([LOADER_RULES],[" -install install-lib:: wine.inf - \$(INSTALL_DATA) wine.inf \$(DESTDIR)\$(datadir)/wine/wine.inf +install install-lib:: \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/wine.inf \$(DESTDIR)\$(datadir)/wine/l_intl.nls + \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls "]) fi +AS_VAR_APPEND([LOADER_RULES],[" +PROGRAMS = $loader_programs +INSTALL_LIB = $loader_programs$loader_install +"]) + if test "$srcdir" = . then AC_CONFIG_COMMANDS([.gitignore], [wine_fn_output_gitignore .gitignore], diff --git a/tools/makedep.c b/tools/makedep.c index 75c7d91..469b833 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2254,6 +2254,8 @@ static struct strarray output_sources( const struct makefile *make, struct strar output( "%s:", obj_dir_path( make, obj )); output_filenames( dependencies ); output( "\n" ); + add_install_rule( make, install_rules, obj, xstrdup( obj ), + strmake( "d$(datadir)/wine/%s", obj )); } else if (!strcmp( ext, "sfd" )) /* font file */ {

1 0

Jeremy Newman : fix broken Ubuntu link
by Jeremy Newman Nov. 12, 2015

Nov. 12, 2015

Module: website Branch: master Commit: a40932d6854b19d60d0473ce6b3d91cadc391bbe URL: http://source.winehq.org/git/website.git/?a=commit;h=a40932d6854b19d60d0473… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 12 14:58:09 2015 -0600 fix broken Ubuntu link Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/he/download.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/he/download.template b/templates/he/download.template index 53107ba..8cec73f 100644 --- a/templates/he/download.template +++ b/templates/he/download.template @@ -58,10 +58,10 @@ </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="{$root}/download/deb"> + <td align="center"><a href="{$root}/download/ubuntu"> <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> - <td> <a href="{$root}/download/deb">הורדת חבילות לאובונטו</a> + <td> <a href="{$root}/download/ubuntu">הורדת חבילות לאובונטו</a> - קובצי .deb להתקנה בינרית ולהתקנה עם קוד המקור לאובונטו Lucid&rlm; (10.04 LTS) <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr>

1 0

Jeremy Newman : Fix broken Ubuntu link
by Jeremy Newman Nov. 12, 2015

Nov. 12, 2015

Module: website Branch: master Commit: ba1c894c0bec66f77a5ae49d9f5b6e6e77a39d88 URL: http://source.winehq.org/git/website.git/?a=commit;h=ba1c894c0bec66f77a5ae4… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 12 14:56:41 2015 -0600 Fix broken Ubuntu link Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/pl/download.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/pl/download.template b/templates/pl/download.template index c22d2d7..7b3505c 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -56,10 +56,10 @@ </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="{$root}/download/deb"> + <td align="center"><a href="{$root}/download/ubuntu"> <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> - <td> <a href="{$root}/download/deb">Pobierz paczki dla Ubuntu</a> + <td> <a href="{$root}/download/ubuntu">Pobierz paczki dla Ubuntu</a> - binarne i źródłowe paczki .deb dla Ubuntu</td> <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr>

1 0

Frédéric Delanoy : French translation for release 1.7.54
by Jeremy Newman Nov. 12, 2015

Nov. 12, 2015

Module: website Branch: master Commit: 746ac9d8b9ae7b8ee866b05f249c181c09dc66f4 URL: http://source.winehq.org/git/website.git/?a=commit;h=746ac9d8b9ae7b8ee866b0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 12 21:19:28 2015 +0100 French translation for release 1.7.54 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2015103001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2015103001.xml b/news/fr/2015103001.xml new file mode 100644 index 0000000..841505b --- /dev/null +++ b/news/fr/2015103001.xml @@ -0,0 +1,16 @@ +<news> +<date>30 octobre 2015</date> +<title>Sortie de Wine 1.7.54</title> +<body> + La version de développement 1.7.54 de Wine est disponible. + <a href="{$root}/announce/1.7.54">Nouveautés</a> de cette version : +<ul> + <li>Implémentation de la fonction TransmitFile.</li> + <li>Poursuite de l'implémentation de la DLL Web Services.</li> + <li>Décodage vidéo amélioré.</li> + <li>Alternative pour l'outil déconseillé prelink.</li> + <li>Mise à jour majeure de la traduction turque.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.54.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Jacek Caban : server: Store all 32 bits of value type.
by Alexandre Julliard Nov. 12, 2015

Nov. 12, 2015

Module: wine Branch: master Commit: 731d09fa9dd7b2efbf8b6a72ddd6dbe68402592f URL: http://source.winehq.org/git/wine.git/?a=commit;h=731d09fa9dd7b2efbf8b6a72d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 14:26:25 2015 +0100 server: Store all 32 bits of value type. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 14 ++++++++++++-- server/registry.c | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index dfec007..96f190b 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -530,14 +530,14 @@ static void test_NtQueryValueKey(void) OBJECT_ATTRIBUTES attr; UNICODE_STRING ValName; KEY_VALUE_BASIC_INFORMATION *basic_info; - KEY_VALUE_PARTIAL_INFORMATION *partial_info; + KEY_VALUE_PARTIAL_INFORMATION *partial_info, pi; KEY_VALUE_FULL_INFORMATION *full_info; DWORD len, expected; pRtlCreateUnicodeStringFromAsciiz(&ValName, "deletetest"); InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); - status = pNtOpenKey(&key, KEY_READ, &attr); + status = pNtOpenKey(&key, KEY_READ|KEY_SET_VALUE, &attr); ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); len = FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[0]); @@ -632,8 +632,18 @@ static void test_NtQueryValueKey(void) ok(len == expected, "NtQueryValueKey wrong len %u\n", len); HeapFree(GetProcessHeap(), 0, partial_info); + pRtlFreeUnicodeString(&ValName); + pRtlCreateUnicodeStringFromAsciiz(&ValName, "custtest"); + status = pNtSetValueKey(key, &ValName, 0, 0xff00ff00, NULL, 0); + ok(status == STATUS_SUCCESS, "NtSetValueKey Failed: 0x%08x\n", status); + + status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformation, &pi, sizeof(pi), &len); + ok(status == STATUS_SUCCESS, "NtQueryValueKey should have returned STATUS_BUFFER_TOO_SMALL instead of 0x%08x\n", status); + ok(pi.Type == 0xff00ff00, "Type=%x\n", pi.Type); + ok(pi.DataLength == 0, "DataLength=%u\n", pi.DataLength); pRtlFreeUnicodeString(&ValName); + pNtClose(key); } diff --git a/server/registry.c b/server/registry.c index dad86e7..c95e103 100644 --- a/server/registry.c +++ b/server/registry.c @@ -93,7 +93,7 @@ struct key_value { WCHAR *name; /* value name */ unsigned short namelen; /* length of value name */ - unsigned short type; /* value type */ + unsigned int type; /* value type */ data_size_t len; /* value data length in bytes */ void *data; /* pointer to value data */ };

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_SOSetTargets().
by Alexandre Julliard Nov. 12, 2015

Nov. 12, 2015

Module: wine Branch: master Commit: 4b281147e1c85f793a531514b33255b7f59873d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b281147e1c85f793a531514b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 11 03:41:00 2015 +0100 d3d11: Implement d3d11_immediate_context_SOSetTargets(). 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/d3d11/device.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4a7b25c..259d73b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -645,7 +645,25 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3 static void STDMETHODCALLTYPE d3d11_immediate_context_SOSetTargets(ID3D11DeviceContext *iface, UINT buffer_count, ID3D11Buffer *const *buffers, const UINT *offsets) { - FIXME("iface %p, buffer_count %u, buffers %p, offsets %p stub!\n", iface, buffer_count, buffers, offsets); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int count, i; + + TRACE("iface %p, buffer_count %u, buffers %p, offsets %p.\n", iface, buffer_count, buffers, offsets); + + count = min(buffer_count, D3D11_SO_BUFFER_SLOT_COUNT); + wined3d_mutex_lock(); + for (i = 0; i < count; ++i) + { + struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); + + wined3d_device_set_stream_output(device->wined3d_device, i, + buffer ? buffer->wined3d_buffer : NULL, offsets[i]); + } + for (; i < D3D11_SO_BUFFER_SLOT_COUNT; ++i) + { + wined3d_device_set_stream_output(device->wined3d_device, i, NULL, 0); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DrawAuto(ID3D11DeviceContext *iface)

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_PSGetShader().
by Alexandre Julliard Nov. 12, 2015

Nov. 12, 2015

Module: wine Branch: master Commit: 8f212a21ed1f3f354bdd8d02c09e5e56d38cf8bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f212a21ed1f3f354bdd8d02c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 11 03:40:58 2015 +0100 d3d11: Implement d3d11_immediate_context_PSGetShader(). 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/d3d11/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 2e086f8..7127a23 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1052,8 +1052,28 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShader(ID3D11DeviceContext *iface, ID3D11PixelShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - FIXME("iface %p, shader %p, class_instances %p, class_instance_count %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct wined3d_shader *wined3d_shader; + struct d3d_pixel_shader *shader_impl; + + TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); + + if (class_instances || class_instance_count) + FIXME("Dynamic linking not implemented yet.\n"); + + wined3d_mutex_lock(); + if (!(wined3d_shader = wined3d_device_get_pixel_shader(device->wined3d_device))) + { + wined3d_mutex_unlock(); + *shader = NULL; + return; + } + + shader_impl = wined3d_shader_get_parent(wined3d_shader); + wined3d_mutex_unlock(); + *shader = &shader_impl->ID3D11PixelShader_iface; + ID3D11PixelShader_AddRef(*shader); } static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetSamplers(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_VSGetShader().
by Alexandre Julliard Nov. 12, 2015

Nov. 12, 2015

Module: wine Branch: master Commit: 3804746de16abc98462c512c5bf32cd708d1792c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3804746de16abc98462c512c5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 11 03:40:55 2015 +0100 d3d11: Implement d3d11_immediate_context_VSGetShader(). 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/d3d11/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b632e08..9261ce8 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1066,8 +1066,28 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShader(ID3D11DeviceContext *iface, ID3D11VertexShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - FIXME("iface %p, shader %p, class_instances %p, class_instance_count %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_vertex_shader *shader_impl; + struct wined3d_shader *wined3d_shader; + + TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); + + if (class_instances || class_instance_count) + FIXME("Dynamic linking not implemented yet.\n"); + + wined3d_mutex_lock(); + if (!(wined3d_shader = wined3d_device_get_vertex_shader(device->wined3d_device))) + { + wined3d_mutex_unlock(); + *shader = NULL; + return; + } + + shader_impl = wined3d_shader_get_parent(wined3d_shader); + wined3d_mutex_unlock(); + *shader = &shader_impl->ID3D11VertexShader_iface; + ID3D11VertexShader_AddRef(*shader); } static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetConstantBuffers(ID3D11DeviceContext *iface,

1 0