August 2015 - Wine-Commits - list.winehq.org

Qian Hong : ntdll/tests: Add tests for FileLinkInformation class.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: 57d443824a0e6739aab5b10351af37ae0d38a9a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d443824a0e6739aab5b1035… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Aug 21 07:24:49 2015 +0200 ntdll/tests: Add tests for FileLinkInformation class. Based on the FileRenameInformation tests by Sebastian Lackner. --- dlls/ntdll/tests/file.c | 630 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 630 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57d443824a0e6739aab5b…

1 0

Dmitry Timoshkov : server: Add implicit PROCESS_[QUERY|SET] _LIMITED_INFORMATION access.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: c19091272d98600de346c516301dd41c2e0a57d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19091272d98600de346c5163… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 21 12:14:09 2015 +0800 server: Add implicit PROCESS_[QUERY|SET]_LIMITED_INFORMATION access. --- server/process.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/process.c b/server/process.c index 7252497..a02493a 100644 --- a/server/process.c +++ b/server/process.c @@ -651,6 +651,10 @@ static unsigned int process_map_access( struct object *obj, unsigned int access PROCESS_VM_WRITE | PROCESS_DUP_HANDLE | PROCESS_CREATE_PROCESS | PROCESS_CREATE_THREAD | PROCESS_VM_OPERATION; if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | PROCESS_QUERY_LIMITED_INFORMATION | PROCESS_TERMINATE; if (access & GENERIC_ALL) access |= PROCESS_ALL_ACCESS; + + if (access & PROCESS_QUERY_INFORMATION) access |= PROCESS_QUERY_LIMITED_INFORMATION; + if (access & PROCESS_SET_INFORMATION) access |= PROCESS_SET_LIMITED_INFORMATION; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); }

1 0

Andrew Eikum : xaudio2: Add stub IXAudio2MasteringVoice implementation.
by Alexandre Julliard Aug. 21, 2015

Aug. 21, 2015

Module: wine Branch: master Commit: 51bd01aec86f05cd353cfb4408f28e58e0d093a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51bd01aec86f05cd353cfb440… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Aug 20 15:06:12 2015 -0500 xaudio2: Add stub IXAudio2MasteringVoice implementation. --- dlls/xaudio2_7/xaudio_dll.c | 205 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 204 insertions(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 03909bd..b7bf390 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -28,6 +28,7 @@ #include "rpcproxy.h" #include "wine/debug.h" +#include "wine/list.h" #include <propsys.h> #include "initguid.h" @@ -73,6 +74,8 @@ HRESULT WINAPI DllUnregisterServer(void) typedef struct { IXAudio27 IXAudio27_iface; IXAudio2 IXAudio2_iface; + IXAudio2MasteringVoice IXAudio2MasteringVoice_iface; + LONG ref; DWORD version; @@ -88,6 +91,194 @@ static inline IXAudio2Impl *impl_from_IXAudio27(IXAudio27 *iface) return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio27_iface); } +IXAudio2Impl *impl_from_IXAudio2MasteringVoice(IXAudio2MasteringVoice *iface) +{ + return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio2MasteringVoice_iface); +} + +static void WINAPI XA2M_GetVoiceDetails(IXAudio2MasteringVoice *iface, + XAUDIO2_VOICE_DETAILS *pVoiceDetails) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %p\n", This, pVoiceDetails); +} + +static HRESULT WINAPI XA2M_SetOutputVoices(IXAudio2MasteringVoice *iface, + const XAUDIO2_VOICE_SENDS *pSendList) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %p\n", This, pSendList); + return S_OK; +} + +static HRESULT WINAPI XA2M_SetEffectChain(IXAudio2MasteringVoice *iface, + const XAUDIO2_EFFECT_CHAIN *pEffectChain) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %p\n", This, pEffectChain); + return S_OK; +} + +static HRESULT WINAPI XA2M_EnableEffect(IXAudio2MasteringVoice *iface, UINT32 EffectIndex, + UINT32 OperationSet) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %u, 0x%x\n", This, EffectIndex, OperationSet); + return S_OK; +} + +static HRESULT WINAPI XA2M_DisableEffect(IXAudio2MasteringVoice *iface, UINT32 EffectIndex, + UINT32 OperationSet) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %u, 0x%x\n", This, EffectIndex, OperationSet); + return S_OK; +} + +static void WINAPI XA2M_GetEffectState(IXAudio2MasteringVoice *iface, UINT32 EffectIndex, + BOOL *pEnabled) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %u, %p\n", This, EffectIndex, pEnabled); +} + +static HRESULT WINAPI XA2M_SetEffectParameters(IXAudio2MasteringVoice *iface, + UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, + UINT32 OperationSet) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %u, %p, 0x%x, 0x%x\n", This, EffectIndex, pParameters, + ParametersByteSize, OperationSet); + return S_OK; +} + +static HRESULT WINAPI XA2M_GetEffectParameters(IXAudio2MasteringVoice *iface, + UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %u, %p, 0x%x\n", This, EffectIndex, pParameters, + ParametersByteSize); + return S_OK; +} + +static HRESULT WINAPI XA2M_SetFilterParameters(IXAudio2MasteringVoice *iface, + const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %p, 0x%x\n", This, pParameters, OperationSet); + return S_OK; +} + +static void WINAPI XA2M_GetFilterParameters(IXAudio2MasteringVoice *iface, + XAUDIO2_FILTER_PARAMETERS *pParameters) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %p\n", This, pParameters); +} + +static HRESULT WINAPI XA2M_SetOutputFilterParameters(IXAudio2MasteringVoice *iface, + IXAudio2Voice *pDestinationVoice, + const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %p, %p, 0x%x\n", This, pDestinationVoice, pParameters, OperationSet); + return S_OK; +} + +static void WINAPI XA2M_GetOutputFilterParameters(IXAudio2MasteringVoice *iface, + IXAudio2Voice *pDestinationVoice, + XAUDIO2_FILTER_PARAMETERS *pParameters) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %p, %p\n", This, pDestinationVoice, pParameters); +} + +static HRESULT WINAPI XA2M_SetVolume(IXAudio2MasteringVoice *iface, float Volume, + UINT32 OperationSet) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %f, 0x%x\n", This, Volume, OperationSet); + return S_OK; +} + +static void WINAPI XA2M_GetVolume(IXAudio2MasteringVoice *iface, float *pVolume) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %p\n", This, pVolume); +} + +static HRESULT WINAPI XA2M_SetChannelVolumes(IXAudio2MasteringVoice *iface, UINT32 Channels, + const float *pVolumes, UINT32 OperationSet) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %u, %p, 0x%x\n", This, Channels, pVolumes, OperationSet); + return S_OK; +} + +static void WINAPI XA2M_GetChannelVolumes(IXAudio2MasteringVoice *iface, UINT32 Channels, + float *pVolumes) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %u, %p\n", This, Channels, pVolumes); +} + +static HRESULT WINAPI XA2M_SetOutputMatrix(IXAudio2MasteringVoice *iface, + IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, + UINT32 DestinationChannels, const float *pLevelMatrix, + UINT32 OperationSet) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %p, %u, %u, %p, 0x%x\n", This, pDestinationVoice, + SourceChannels, DestinationChannels, pLevelMatrix, OperationSet); + return S_OK; +} + +static void WINAPI XA2M_GetOutputMatrix(IXAudio2MasteringVoice *iface, + IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, + UINT32 DestinationChannels, float *pLevelMatrix) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %p, %u, %u, %p\n", This, pDestinationVoice, + SourceChannels, DestinationChannels, pLevelMatrix); +} + +static void WINAPI XA2M_DestroyVoice(IXAudio2MasteringVoice *iface) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p\n", This); +} + +/* not present in XAudio2 2.7 */ +static void WINAPI XA2M_GetChannelMask(IXAudio2MasteringVoice *iface, + DWORD *pChannelMask) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p %p\n", This, pChannelMask); +} + +struct IXAudio2MasteringVoiceVtbl XAudio2MasteringVoice_Vtbl = { + XA2M_GetVoiceDetails, + XA2M_SetOutputVoices, + XA2M_SetEffectChain, + XA2M_EnableEffect, + XA2M_DisableEffect, + XA2M_GetEffectState, + XA2M_SetEffectParameters, + XA2M_GetEffectParameters, + XA2M_SetFilterParameters, + XA2M_GetFilterParameters, + XA2M_SetOutputFilterParameters, + XA2M_GetOutputFilterParameters, + XA2M_SetVolume, + XA2M_GetVolume, + XA2M_SetChannelVolumes, + XA2M_GetChannelVolumes, + XA2M_SetOutputMatrix, + XA2M_GetOutputMatrix, + XA2M_DestroyVoice, + XA2M_GetChannelMask +}; + static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid, void **ppvObject) { @@ -194,7 +385,18 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, ppMasteringVoice, inputChannels, inputSampleRate, flags, wine_dbgstr_w(deviceId), pEffectChain, streamCategory); - return E_NOTIMPL; + if(flags != 0) + WARN("Unknown flags set: 0x%x\n", flags); + + if(pEffectChain) + WARN("Effect chain is unimplemented\n"); + + /* TODO: Initialize mmdevice */ + + /* there can only be one Mastering Voice, so just build it into XA2 */ + *ppMasteringVoice = &This->IXAudio2MasteringVoice_iface; + + return S_OK; } static HRESULT WINAPI IXAudio2Impl_StartEngine(IXAudio2 *iface) @@ -450,6 +652,7 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p object->IXAudio27_iface.lpVtbl = &XAudio27_Vtbl; object->IXAudio2_iface.lpVtbl = &XAudio2_Vtbl; + object->IXAudio2MasteringVoice_iface.lpVtbl = &XAudio2MasteringVoice_Vtbl; if(IsEqualGUID(riid, &IID_IXAudio27)) object->version = 27;

1 0

Sebastian Lackner : ntdll: Implement FileRenameInformation support.
by Alexandre Julliard Aug. 20, 2015

Aug. 20, 2015

Module: wine Branch: master Commit: 857d436784dcc677bbbda905437c93cf61f1ddb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=857d436784dcc677bbbda9054… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 20 10:25:15 2015 +0200 ntdll: Implement FileRenameInformation support. --- dlls/ntdll/file.c | 44 ++++++++++++++++- dlls/ntdll/tests/file.c | 76 +++++++++++++++-------------- include/wine/server_protocol.h | 30 +++++++++--- server/fd.c | 105 ++++++++++++++++++++++++++++++++++++++++- server/protocol.def | 12 ++++- server/request.h | 15 ++++-- server/trace.c | 16 +++++-- 7 files changed, 244 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=857d436784dcc677bbbda…

1 0

Dmitry Timoshkov : advapi32/tests: Add a test to show that THREAD_QUERY_INFORMATION should grant THREAD_QUERY_LIMITED_INFORMATION.
by Alexandre Julliard Aug. 20, 2015

Aug. 20, 2015

Module: wine Branch: master Commit: 48ed6a6f3ec8871b1ec8fed6f5ea16f9c17edb40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ed6a6f3ec8871b1ec8fed6f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 20 16:13:27 2015 +0800 advapi32/tests: Add a test to show that THREAD_QUERY_INFORMATION should grant THREAD_QUERY_LIMITED_INFORMATION. --- dlls/advapi32/tests/security.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 70aa949..5d52fab 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5495,6 +5495,16 @@ todo_wine CloseHandle(dup); } + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), thread, GetCurrentProcess(), &dup, + THREAD_QUERY_INFORMATION, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + access = get_obj_access(dup); + ok(access == (THREAD_QUERY_INFORMATION | THREAD_QUERY_LIMITED_INFORMATION) /* Vista+ */ || + access == THREAD_QUERY_INFORMATION /* before Vista */, + "expected THREAD_QUERY_INFORMATION|THREAD_QUERY_LIMITED_INFORMATION, got %#x\n", access); + CloseHandle(dup); + TerminateThread(thread, 0); CloseHandle(thread); }

1 0

Jianqiu Zhang : ntdll/tests: Add basic tests for FileRenameInformation.
by Alexandre Julliard Aug. 20, 2015

Aug. 20, 2015

Module: wine Branch: master Commit: a5b58144a555ed67219c9ba0c8f65f3fd6607977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5b58144a555ed67219c9ba0c… Author: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> Date: Thu Aug 20 10:24:32 2015 +0200 ntdll/tests: Add basic tests for FileRenameInformation. --- dlls/ntdll/tests/file.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index d215d09..f143834 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1435,6 +1435,111 @@ static void test_file_all_information(void) CloseHandle( h ); } +static void test_file_rename_information(void) +{ + static const WCHAR fooW[] = {'f','o','o',0}; + WCHAR tmp_path[MAX_PATH], oldpath[MAX_PATH], newpath[MAX_PATH]; + FILE_RENAME_INFORMATION *fri; + UNICODE_STRING name_str; + IO_STATUS_BLOCK io; + BOOL fileDeleted; + HANDLE handle; + NTSTATUS res; + + GetTempPathW( MAX_PATH, tmp_path ); + + /* oldpath is a file, newpath doesn't exist */ + res = GetTempFileNameW( tmp_path, fooW, 0, oldpath ); + ok( res != 0, "failed to create temp file\n" ); + handle = CreateFileW( oldpath, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFileW failed\n" ); + + res = GetTempFileNameW( tmp_path, fooW, 0, newpath ); + ok( res != 0, "failed to create temp file\n" ); + pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); + DeleteFileW( newpath ); + fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); + fri->Replace = FALSE; + fri->RootDir = NULL; + fri->FileNameLength = name_str.Length; + memcpy( fri->FileName, name_str.Buffer, name_str.Length ); + pRtlFreeUnicodeString( &name_str ); + + U(io).Status = 0xdeadbeef; + res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); + todo_wine ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status ); + todo_wine ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); + fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + todo_wine ok( fileDeleted, "file should not exist\n" ); + fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + todo_wine ok( !fileDeleted, "file should exist\n" ); + + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, fri ); + DeleteFileW( oldpath ); + DeleteFileW( newpath ); + + /* oldpath is a file, newpath is a file, Replace = FALSE */ + res = GetTempFileNameW( tmp_path, fooW, 0, oldpath ); + ok( res != 0, "failed to create temp file\n" ); + handle = CreateFileW( oldpath, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFileW failed\n" ); + + res = GetTempFileNameW( tmp_path, fooW, 0, newpath ); + ok( res != 0, "failed to create temp file\n" ); + pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); + fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); + fri->Replace = FALSE; + fri->RootDir = NULL; + fri->FileNameLength = name_str.Length; + memcpy( fri->FileName, name_str.Buffer, name_str.Length ); + pRtlFreeUnicodeString( &name_str ); + + U(io).Status = 0xdeadbeef; + res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); + todo_wine ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %x\n", res ); + fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "file should exist\n" ); + fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "file should exist\n" ); + + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, fri ); + DeleteFileW( oldpath ); + DeleteFileW( newpath ); + + /* oldpath is a file, newpath is a file, Replace = TRUE */ + res = GetTempFileNameW( tmp_path, fooW, 0, oldpath ); + ok( res != 0, "failed to create temp file\n" ); + handle = CreateFileW( oldpath, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFileW failed\n" ); + + res = GetTempFileNameW( tmp_path, fooW, 0, newpath ); + ok( res != 0, "failed to create temp file\n" ); + pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); + fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); + fri->Replace = TRUE; + fri->RootDir = NULL; + fri->FileNameLength = name_str.Length; + memcpy( fri->FileName, name_str.Buffer, name_str.Length ); + pRtlFreeUnicodeString( &name_str ); + + U(io).Status = 0xdeadbeef; + res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); + todo_wine ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status ); + todo_wine ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); + fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + todo_wine ok( fileDeleted, "file should not exist\n" ); + fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "file should exist\n" ); + + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, fri ); + DeleteFileW( oldpath ); + DeleteFileW( newpath ); +} + static void test_file_both_information(void) { IO_STATUS_BLOCK io; @@ -2858,6 +2963,7 @@ START_TEST(file) test_file_name_information(); test_file_full_size_information(); test_file_all_name_information(); + test_file_rename_information(); test_file_disposition_information(); test_query_volume_information_file(); test_query_attribute_information_file();

1 0

Alistair Leslie-Hughes : include/d3dcommon.idl: Add missing typedefs.
by Alexandre Julliard Aug. 20, 2015

Aug. 20, 2015

Module: wine Branch: master Commit: 5eaf2b5179ba5d95ebc4ffd66834a96dfe07d21d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eaf2b5179ba5d95ebc4ffd66… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jul 26 11:21:53 2015 +1000 include/d3dcommon.idl: Add missing typedefs. --- include/d3dcommon.idl | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index f8fe203..c7e3b4d 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -126,6 +126,19 @@ typedef enum _D3D_SHADER_VARIABLE_CLASS D3D_SVC_FORCE_DWORD = 0x7fffffff, } D3D_SHADER_VARIABLE_CLASS; +typedef enum _D3D_SHADER_VARIABLE_FLAGS +{ + D3D_SVF_USERPACKED = 0x01, + D3D_SVF_USED = 0x02, + D3D_SVF_INTERFACE_POINTER = 0x04, + D3D_SVF_INTERFACE_PARAMETER = 0x08, + D3D10_SVF_USERPACKED = D3D_SVF_USERPACKED, + D3D10_SVF_USED = D3D_SVF_USED, + D3D11_SVF_INTERFACE_POINTER = D3D_SVF_INTERFACE_POINTER, + D3D11_SVF_INTERFACE_PARAMETER = D3D_SVF_INTERFACE_PARAMETER, + D3D_SVF_FORCE_DWORD = 0x7fffffff +} D3D_SHADER_VARIABLE_FLAGS; + typedef enum _D3D_SHADER_VARIABLE_TYPE { D3D_SVT_VOID, @@ -235,6 +248,22 @@ typedef enum _D3D_SHADER_VARIABLE_TYPE D3D_SVT_FORCE_DWORD = 0x7fffffff, } D3D_SHADER_VARIABLE_TYPE; +typedef enum _D3D_SHADER_INPUT_FLAGS +{ + D3D_SIF_USERPACKED = 0x01, + D3D_SIF_COMPARISON_SAMPLER = 0x02, + D3D_SIF_TEXTURE_COMPONENT_0 = 0x04, + D3D_SIF_TEXTURE_COMPONENT_1 = 0x08, + D3D_SIF_TEXTURE_COMPONENTS = 0x0C, + D3D_SIF_UNUSED = 0x10, + D3D10_SIF_USERPACKED = D3D_SIF_USERPACKED, + D3D10_SIF_COMPARISON_SAMPLER = D3D_SIF_COMPARISON_SAMPLER, + D3D10_SIF_TEXTURE_COMPONENT_0 = D3D_SIF_TEXTURE_COMPONENT_0, + D3D10_SIF_TEXTURE_COMPONENT_1 = D3D_SIF_TEXTURE_COMPONENT_1, + D3D10_SIF_TEXTURE_COMPONENTS = D3D_SIF_TEXTURE_COMPONENTS, + D3D_SIF_FORCE_DWORD = 0x7fffffff +} D3D_SHADER_INPUT_FLAGS; + typedef enum D3D_PRIMITIVE { D3D_PRIMITIVE_UNDEFINED, @@ -636,4 +665,11 @@ typedef enum _D3D_SHADER_INPUT_TYPE D3D11_SIT_UAV_RWSTRUCTURED_WITH_COUNTER, } D3D_SHADER_INPUT_TYPE; +typedef enum _D3D_SHADER_CBUFFER_FLAGS +{ + D3D_CBF_USERPACKED = 0x01, + D3D10_CBF_USERPACKED = D3D_CBF_USERPACKED, + D3D_CBF_FORCE_DWORD = 0x7fffffff +} D3D_SHADER_CBUFFER_FLAGS; + cpp_quote("DEFINE_GUID(WKPDID_D3DDebugObjectName,0x429b8c22,0x9188,0x4b0c,0x87,0x42,0xac,0xb0,0xbf,0x85,0xc2,0x00);")

1 0

Henri Verbeet : d2d1: Implement d2d_factory_CreateTransformedGeometry().
by Alexandre Julliard Aug. 20, 2015

Aug. 20, 2015

Module: wine Branch: master Commit: acbb0bdfacd8f322df3d4c316b826f809125fb14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acbb0bdfacd8f322df3d4c316… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 20 11:42:04 2015 +0200 d2d1: Implement d2d_factory_CreateTransformedGeometry(). --- dlls/d2d1/d2d1_private.h | 8 ++ dlls/d2d1/factory.c | 14 ++- dlls/d2d1/geometry.c | 261 +++++++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/render_target.c | 39 +++++-- dlls/d2d1/tests/d2d1.c | 144 ++++++++++++++++++++----- 5 files changed, 426 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=acbb0bdfacd8f322df3d4…

1 0

Huw Davies : gdi32/tests: 64-bit GetFontFileInfo may fail with error ERROR_NOACCESS.
by Alexandre Julliard Aug. 20, 2015

Aug. 20, 2015

Module: wine Branch: master Commit: 5021e91940fe01a54e6ee91f9d9f246ce8f6dd84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5021e91940fe01a54e6ee91f9… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 20 10:50:24 2015 +0100 gdi32/tests: 64-bit GetFontFileInfo may fail with error ERROR_NOACCESS. --- dlls/gdi32/tests/font.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 68ade9a..65685ac 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4116,7 +4116,7 @@ static void test_RealizationInfo(void) { HDC hdc; DWORD info[4], info2[10]; - BOOL r; + BOOL r, have_file = FALSE; HFONT hfont, hfont_old; LOGFONTA lf; DWORD needed, read; @@ -4199,25 +4199,30 @@ static void test_RealizationInfo(void) /* Test GetFontFileInfo() */ r = pGetFontFileInfo(info2[3], 0, &file_info, sizeof(file_info), &needed); - ok(r != 0, "ret 0 gle %d\n", GetLastError()); - - h = CreateFileW(file_info.path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - ok(h != INVALID_HANDLE_VALUE, "Unable to open file %d\n", GetLastError()); + ok(r != 0 || GetLastError() == ERROR_NOACCESS, "ret %d gle %d\n", r, GetLastError()); - GetFileTime(h, NULL, NULL, &time); - ok(!CompareFileTime(&file_info.time, &time), "time mismatch\n"); - GetFileSizeEx(h, &size); - ok(file_info.size.QuadPart == size.QuadPart, "size mismatch\n"); - - /* Read first 16 bytes from the file */ - ReadFile(h, file, sizeof(file), &read, NULL); - CloseHandle(h); + if (r) + { + h = CreateFileW(file_info.path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "Unable to open file %d\n", GetLastError()); + + GetFileTime(h, NULL, NULL, &time); + ok(!CompareFileTime(&file_info.time, &time), "time mismatch\n"); + GetFileSizeEx(h, &size); + ok(file_info.size.QuadPart == size.QuadPart, "size mismatch\n"); + + /* Read first 16 bytes from the file */ + ReadFile(h, file, sizeof(file), &read, NULL); + CloseHandle(h); + have_file = TRUE; + } /* Get bytes 2 - 16 using GetFontFileData */ r = pGetFontFileData(info2[3], 0, 2, data, sizeof(data)); ok(r != 0, "ret 0 gle %d\n", GetLastError()); - ok(!memcmp(data, file + 2, sizeof(data)), "mismatch\n"); + if (have_file) + ok(!memcmp(data, file + 2, sizeof(data)), "mismatch\n"); } DeleteObject(SelectObject(hdc, hfont_old));

1 0

Stefan Dösinger : wined3d: Use GL_RGB565 if available.
by Alexandre Julliard Aug. 20, 2015

Aug. 20, 2015

Module: wine Branch: master Commit: 3bd0eb3eab26299f5af18a94d98ea131949e68e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd0eb3eab26299f5af18a94d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 20 10:03:33 2015 +0200 wined3d: Use GL_RGB565 if available. This offers better precision on r300g and r600g than GL_RGB5. --- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/utils.c | 5 +++++ dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 13 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8e4448d..3f52300 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -116,6 +116,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS }, {"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_fragment_program", ARB_FRAGMENT_PROGRAM }, {"GL_ARB_fragment_shader", ARB_FRAGMENT_SHADER }, {"GL_ARB_framebuffer_object", ARB_FRAMEBUFFER_OBJECT }, @@ -2483,6 +2484,12 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) /* GL_ARB_draw_instanced */ USE_GL_FUNC(glDrawArraysInstancedARB) USE_GL_FUNC(glDrawElementsInstancedARB) + /* GL_ARB_ES2_compatibility */ + USE_GL_FUNC(glReleaseShaderCompiler) + USE_GL_FUNC(glShaderBinary) + USE_GL_FUNC(glGetShaderPrecisionFormat) + USE_GL_FUNC(glDepthRangef) + USE_GL_FUNC(glClearDepthf) /* GL_ARB_framebuffer_object */ USE_GL_FUNC(glBindFramebuffer) USE_GL_FUNC(glBindRenderbuffer) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0d4e878..ee4ccfd 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1019,6 +1019,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_EXT_NONE, NULL}, + {WINED3DFMT_B5G6R5_UNORM, GL_RGB565, GL_RGB565, GL_RGB8, + GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET, + ARB_ES2_COMPATIBILITY, NULL}, {WINED3DFMT_B5G5R5X1_UNORM, GL_RGB5, GL_RGB5_A1, 0, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 8c07ed1..2be7262 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -52,6 +52,7 @@ enum wined3d_gl_extension ARB_DRAW_BUFFERS, ARB_DRAW_ELEMENTS_BASE_VERTEX, ARB_DRAW_INSTANCED, + ARB_ES2_COMPATIBILITY, ARB_FRAGMENT_PROGRAM, ARB_FRAGMENT_SHADER, ARB_FRAMEBUFFER_OBJECT,

1 0