November 2015 - Wine-commits

Józef Kucia : d3d11: Implement d3d11_immediate_context_OMGetRenderTargets().
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 860433c79ad3f2f00554c0826240881b8c60d075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=860433c79ad3f2f00554c0826… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 13 02:23:42 2015 +0100 d3d11: Implement d3d11_immediate_context_OMGetRenderTargets(). 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 | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 78a6b1d..0c146e4 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1444,8 +1444,48 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargets(ID3D11D UINT render_target_view_count, ID3D11RenderTargetView **render_target_views, ID3D11DepthStencilView **depth_stencil_view) { - FIXME("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct wined3d_rendertarget_view *wined3d_view; + + TRACE("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p.\n", iface, render_target_view_count, render_target_views, depth_stencil_view); + + wined3d_mutex_lock(); + if (render_target_views) + { + struct d3d_rendertarget_view *view_impl; + unsigned int i; + + for (i = 0; i < render_target_view_count; ++i) + { + if (!(wined3d_view = wined3d_device_get_rendertarget_view(device->wined3d_device, i)) + || !(view_impl = wined3d_rendertarget_view_get_parent(wined3d_view))) + { + render_target_views[i] = NULL; + continue; + } + + render_target_views[i] = &view_impl->ID3D11RenderTargetView_iface; + ID3D11RenderTargetView_AddRef(render_target_views[i]); + } + } + + if (depth_stencil_view) + { + struct d3d_depthstencil_view *view_impl; + + if (!(wined3d_view = wined3d_device_get_depth_stencil_view(device->wined3d_device)) + || !(view_impl = wined3d_rendertarget_view_get_parent(wined3d_view))) + { + *depth_stencil_view = NULL; + } + else + { + *depth_stencil_view = &view_impl->ID3D11DepthStencilView_iface; + ID3D11DepthStencilView_AddRef(*depth_stencil_view); + } + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargetsAndUnorderedAccessViews(

1 0

Andrey Gusev : include: Add d3dx10.h file.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 62e290edeee8463ce956d1293488b98992be786f URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e290edeee8463ce956d1293… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Nov 10 00:00:23 2015 +0200 include: Add d3dx10.h file. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3dx10.h | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 299a095..27f0ef6 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -245,6 +245,7 @@ HEADER_SRCS = \ d3drmwin.h \ d3dtypes.h \ d3dvec.inl \ + d3dx10.h \ d3dx9.h \ d3dx9anim.h \ d3dx9core.h \ diff --git a/include/d3dx10.h b/include/d3dx10.h new file mode 100644 index 0000000..6333349 --- /dev/null +++ b/include/d3dx10.h @@ -0,0 +1,32 @@ +/* + * Copyright 2015 Andrey Gusev + * + * 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 __D3DX10_H__ +#define __D3DX10_H__ + +#include <limits.h> +#include <float.h> + +#define D3DX10_DEFAULT (0xffffffffu) +#define D3DX10_FROM_FILE (0xfffffffdu) +#define DXGI_FORMAT_FROM_FILE ((DXGI_FORMAT)0xfffffffdu) + +#include "d3d10.h" +#include "d3dx10core.h" + +#endif

1 0

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

13 Nov '15

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

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

13 Nov '15

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 : kernel32: Added DECLSPEC_HOTPATCHABLE to WinExec function.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 1130a11ccedfb6692f384f13a131c1ed85b97882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1130a11ccedfb6692f384f13a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 16:05:01 2015 +0100 kernel32: Added DECLSPEC_HOTPATCHABLE to WinExec function. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 5e6ab10..17ae16d 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2556,7 +2556,7 @@ static DWORD wait_input_idle( HANDLE process, DWORD timeout ) /*********************************************************************** * WinExec (KERNEL32.@) */ -UINT WINAPI WinExec( LPCSTR lpCmdLine, UINT nCmdShow ) +UINT WINAPI DECLSPEC_HOTPATCH WinExec( LPCSTR lpCmdLine, UINT nCmdShow ) { PROCESS_INFORMATION info; STARTUPINFOA startup;

1 0

Jacek Caban : oleaut32: Added DECLSPEC_HOTPATCHABLE to a few functions.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 9398c9f98fc975def41addc4c1147b313148daa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9398c9f98fc975def41addc4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 16:07:55 2015 +0100 oleaut32: Added DECLSPEC_HOTPATCHABLE to a few functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 4cd5135..0352215 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> #include <string.h> #include <limits.h> @@ -499,7 +501,7 @@ static const WCHAR *pdelimiter = &_delimiter[0]; * Success: S_OK. * Failure: HRESULT code. */ -HRESULT WINAPI RegisterActiveObject( +HRESULT WINAPI DECLSPEC_HOTPATCH RegisterActiveObject( LPUNKNOWN punk,REFCLSID rcid,DWORD dwFlags,LPDWORD pdwRegister ) { WCHAR guidbuf[80]; @@ -538,7 +540,7 @@ HRESULT WINAPI RegisterActiveObject( * Success: S_OK. * Failure: HRESULT code. */ -HRESULT WINAPI RevokeActiveObject(DWORD xregister,LPVOID reserved) +HRESULT WINAPI DECLSPEC_HOTPATCH RevokeActiveObject(DWORD xregister,LPVOID reserved) { LPRUNNINGOBJECTTABLE runobtable; HRESULT ret; @@ -565,7 +567,7 @@ HRESULT WINAPI RevokeActiveObject(DWORD xregister,LPVOID reserved) * Success: S_OK. * Failure: HRESULT code. */ -HRESULT WINAPI GetActiveObject(REFCLSID rcid,LPVOID preserved,LPUNKNOWN *ppunk) +HRESULT WINAPI DECLSPEC_HOTPATCH GetActiveObject(REFCLSID rcid,LPVOID preserved,LPUNKNOWN *ppunk) { WCHAR guidbuf[80]; HRESULT ret;

1 0

Jacek Caban : advapi32: Use absolute registry paths to create special root keys.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: ba081cab56846d458b554e92fcb1f9078269ba78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba081cab56846d458b554e92f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 17:19:32 2015 +0100 advapi32: Use absolute registry paths to create special root keys. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 0f23f4c..798f93d 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -48,23 +48,29 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); #define HKEY_SPECIAL_ROOT_LAST HKEY_DYN_DATA static const WCHAR name_CLASSES_ROOT[] = - {'M','a','c','h','i','n','e','\\', + {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', 'S','o','f','t','w','a','r','e','\\', 'C','l','a','s','s','e','s',0}; static const WCHAR name_LOCAL_MACHINE[] = - {'M','a','c','h','i','n','e',0}; + {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e',0}; static const WCHAR name_USERS[] = - {'U','s','e','r',0}; + {'\\','R','e','g','i','s','t','r','y','\\', + 'U','s','e','r',0}; static const WCHAR name_PERFORMANCE_DATA[] = - {'P','e','r','f','D','a','t','a',0}; + {'\\','R','e','g','i','s','t','r','y','\\', + 'P','e','r','f','D','a','t','a',0}; static const WCHAR name_CURRENT_CONFIG[] = - {'M','a','c','h','i','n','e','\\', + {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'H','a','r','d','w','a','r','e',' ','P','r','o','f','i','l','e','s','\\', 'C','u','r','r','e','n','t',0}; static const WCHAR name_DYN_DATA[] = - {'D','y','n','D','a','t','a',0}; + {'\\','R','e','g','i','s','t','r','y','\\', + 'D','y','n','D','a','t','a',0}; static const WCHAR * const root_key_names[] = {

1 0

Piotr Caban : wininet: Create file with correct file name in test_trailing_slash tests.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 493d414cadd504992944b1139fba4118202deca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=493d414cadd504992944b1139… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 12 18:22:27 2015 +0100 wininet: Create file with correct file name in test_trailing_slash tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/urlcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 37ee412..310054b 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -1086,7 +1086,7 @@ static void test_trailing_slash(void) ret = CreateUrlCacheEntryA(url_with_slash, 0, "html", filename, 0); ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); - create_and_write_file(filenameA, &zero_byte, sizeof(zero_byte)); + create_and_write_file(filename, &zero_byte, sizeof(zero_byte)); ret = CommitUrlCacheEntryA("Visited: http://testing.cache.com/", NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY, NULL, 0, "html", NULL);

1 0

Andrew Eikum : xaudio2_7: Update current buffer position after flushing buffers.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: d672ebfeb858e5283ce359bc1b7ced89f8f1582d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d672ebfeb858e5283ce359bc1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Nov 12 14:27:47 2015 -0600 xaudio2_7: Update current buffer position after flushing buffers. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 9cf6ba6..15b3ab9 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -633,6 +633,7 @@ static HRESULT WINAPI XA2SRC_FlushSourceBuffers(IXAudio2SourceVoice *iface) } This->nbufs -= to_flush; + This->cur_buf = (This->first_buf + This->nbufs) % XAUDIO2_MAX_QUEUED_BUFFERS; LeaveCriticalSection(&This->lock);

1 0

André Hentschel : maintainers: Update winemaker section.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: d4645291eff1d48e736db26369ae0e8c8331ac4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4645291eff1d48e736db2636… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Nov 12 22:56:46 2015 +0100 maintainers: Update winemaker section. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index bb55d55..a5ed66e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -225,7 +225,7 @@ F: server/ Winemaker M: André Hentschel <nerv(a)dawncrow.de> -F: tools/winemaker +F: tools/winemaker/ WinHTTP M: Hans Leidekker <hans(a)codeweavers.com>

1 0