September 2017 - Wine-Commits

Jacek Caban : ntdll/tests: Test NtQueryVolumeInformationFile calls on named pipe object.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: 4df0162caf431d0069371e6c0776b83ed4c35735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df0162caf431d0069371e6c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 25 16:38:13 2017 +0200 ntdll/tests: Test NtQueryVolumeInformationFile calls on named pipe object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 41 +++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 24 +++++++++++++++--------- 2 files changed, 56 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index f567e61..c448526 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -73,6 +73,7 @@ static NTSTATUS (WINAPI *pNtCreateNamedPipeFile) (PHANDLE handle, ULONG access, ULONG inbound_quota, ULONG outbound_quota, PLARGE_INTEGER timeout); static NTSTATUS (WINAPI *pNtQueryInformationFile) (IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock, OUT PVOID FileInformation, IN ULONG Length, IN FILE_INFORMATION_CLASS FileInformationClass); +static NTSTATUS (WINAPI *pNtQueryVolumeInformationFile)(HANDLE handle, PIO_STATUS_BLOCK io, void *buffer, ULONG length, FS_INFORMATION_CLASS info_class); static NTSTATUS (WINAPI *pNtSetInformationFile) (HANDLE handle, PIO_STATUS_BLOCK io, PVOID ptr, ULONG len, FILE_INFORMATION_CLASS class); static NTSTATUS (WINAPI *pNtCancelIoFile) (HANDLE hFile, PIO_STATUS_BLOCK io_status); static NTSTATUS (WINAPI *pNtCancelIoFileEx) (HANDLE hFile, IO_STATUS_BLOCK *iosb, IO_STATUS_BLOCK *io_status); @@ -94,6 +95,7 @@ static BOOL init_func_ptrs(void) loadfunc(NtFsControlFile) loadfunc(NtCreateNamedPipeFile) loadfunc(NtQueryInformationFile) + loadfunc(NtQueryVolumeInformationFile) loadfunc(NtSetInformationFile) loadfunc(NtCancelIoFile) loadfunc(NtCancelIoFileEx) @@ -1100,6 +1102,43 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type) CloseHandle(event); } +static void test_volume_info(void) +{ + FILE_FS_DEVICE_INFORMATION *device_info; + IO_STATUS_BLOCK iosb; + HANDLE read, write; + char buffer[128]; + NTSTATUS status; + + if (!create_pipe_pair( &read, &write, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_INBOUND, + PIPE_TYPE_MESSAGE, 4096 )) return; + + memset( buffer, 0xaa, sizeof(buffer) ); + status = pNtQueryVolumeInformationFile( read, &iosb, buffer, sizeof(buffer), FileFsDeviceInformation ); + todo_wine { + ok( status == STATUS_SUCCESS, "NtQueryVolumeInformationFile failed: %x\n", status ); + ok( iosb.Information == sizeof(*device_info), "Information = %lu\n", iosb.Information ); + device_info = (FILE_FS_DEVICE_INFORMATION*)buffer; + ok( device_info->DeviceType == FILE_DEVICE_NAMED_PIPE, "DeviceType = %u\n", device_info->DeviceType ); + ok( !(device_info->Characteristics & ~FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL), + "Characteristics = %x\n", device_info->Characteristics ); + } + + memset( buffer, 0xaa, sizeof(buffer) ); + status = pNtQueryVolumeInformationFile( write, &iosb, buffer, sizeof(buffer), FileFsDeviceInformation ); + todo_wine { + ok( status == STATUS_SUCCESS, "NtQueryVolumeInformationFile failed: %x\n", status ); + ok( iosb.Information == sizeof(*device_info), "Information = %lu\n", iosb.Information ); + device_info = (FILE_FS_DEVICE_INFORMATION*)buffer; + ok( device_info->DeviceType == FILE_DEVICE_NAMED_PIPE, "DeviceType = %u\n", device_info->DeviceType ); + ok( !(device_info->Characteristics & ~FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL), + "Characteristics = %x\n", device_info->Characteristics ); + } + + CloseHandle( read ); + CloseHandle( write ); +} + START_TEST(pipe) { if (!init_func_ptrs()) @@ -1141,4 +1180,6 @@ START_TEST(pipe) read_pipe_test(PIPE_ACCESS_OUTBOUND, PIPE_TYPE_MESSAGE); trace("starting message read in message mode server -> client\n"); read_pipe_test(PIPE_ACCESS_OUTBOUND, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE); + + test_volume_info(); } diff --git a/include/winternl.h b/include/winternl.h index df20da5..ec8b387 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1715,15 +1715,21 @@ typedef struct _RTL_HANDLE_TABLE #define FILE_MAXIMUM_DISPOSITION 5 /* Characteristics of a File System */ -#define FILE_REMOVABLE_MEDIA 0x00000001 -#define FILE_READ_ONLY_DEVICE 0x00000002 -#define FILE_FLOPPY_DISKETTE 0x00000004 -#define FILE_WRITE_ONE_MEDIA 0x00000008 -#define FILE_REMOTE_DEVICE 0x00000010 -#define FILE_DEVICE_IS_MOUNTED 0x00000020 -#define FILE_VIRTUAL_VOLUME 0x00000040 -#define FILE_AUTOGENERATED_DEVICE_NAME 0x00000080 -#define FILE_DEVICE_SECURE_OPEN 0x00000100 +#define FILE_REMOVABLE_MEDIA 0x00000001 +#define FILE_READ_ONLY_DEVICE 0x00000002 +#define FILE_FLOPPY_DISKETTE 0x00000004 +#define FILE_WRITE_ONE_MEDIA 0x00000008 +#define FILE_REMOTE_DEVICE 0x00000010 +#define FILE_DEVICE_IS_MOUNTED 0x00000020 +#define FILE_VIRTUAL_VOLUME 0x00000040 +#define FILE_AUTOGENERATED_DEVICE_NAME 0x00000080 +#define FILE_DEVICE_SECURE_OPEN 0x00000100 +#define FILE_CHARACTERISTIC_PNP_DEVICE 0x00000800 +#define FILE_CHARACTERISTIC_TS_DEVICE 0x00001000 +#define FILE_CHARACTERISTIC_WEBDAV_DEVICE 0x00002000 +#define FILE_CHARACTERISTIC_CSV 0x00010000 +#define FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL 0x00020000 +#define FILE_PORTABLE_DEVICE 0x00040000 /* options for NtCreateNamedPipeFile */ #define FILE_PIPE_INBOUND 0x00000000

1 0

Andrew Eikum : wineandroid: Create OpenSL outputmix object globally.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: a0157f57cbe7e8274afdda9067b30e4b155bff70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0157f57cbe7e8274afdda906… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 25 13:14:12 2017 -0500 wineandroid: Create OpenSL outputmix object globally. This object will take multiple inputs, no need to re-create it for every IAudioClient. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/mmdevdrv.c | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 6b05c50..d661fb5 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -128,7 +128,6 @@ struct ACImpl { HANDLE event; float *vols; - SLObjectItf outputmix; SLObjectItf player; SLObjectItf recorder; SLAndroidSimpleBufferQueueItf bufq; @@ -284,6 +283,7 @@ int WINAPI AUDDRV_GetPriority(void) static SLObjectItf sl; static SLEngineItf engine; +static SLObjectItf outputmix; HRESULT AUDDRV_Init(void) { @@ -310,6 +310,21 @@ HRESULT AUDDRV_Init(void) return E_FAIL; } + sr = SLCALL(engine, CreateOutputMix, &outputmix, 0, NULL, NULL); + if(sr != SL_RESULT_SUCCESS){ + SLCALL_N(sl, Destroy); + WARN("CreateOutputMix failed: 0x%x\n", sr); + return E_FAIL; + } + + sr = SLCALL(outputmix, Realize, SL_BOOLEAN_FALSE); + if(sr != SL_RESULT_SUCCESS){ + SLCALL_N(outputmix, Destroy); + SLCALL_N(sl, Destroy); + WARN("outputmix Realize failed: 0x%x\n", sr); + return E_FAIL; + } + return S_OK; } @@ -347,7 +362,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, ACImpl *This; HRESULT hr; EDataFlow flow; - SLresult sr; TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); @@ -372,24 +386,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, return hr; } - if(flow == eRender){ - sr = SLCALL(engine, CreateOutputMix, &This->outputmix, 0, NULL, NULL); - if(sr != SL_RESULT_SUCCESS){ - WARN("CreateOutputMix failed: 0x%x\n", sr); - HeapFree(GetProcessHeap(), 0, This); - return E_FAIL; - } - - sr = SLCALL(This->outputmix, Realize, SL_BOOLEAN_FALSE); - if(sr != SL_RESULT_SUCCESS){ - SLCALL_N(This->outputmix, Destroy); - This->outputmix = NULL; - HeapFree(GetProcessHeap(), 0, This); - WARN("outputmix Realize failed: 0x%x\n", sr); - return E_FAIL; - } - } - This->dataflow = flow; This->IAudioClient_iface.lpVtbl = &AudioClient_Vtbl; @@ -472,8 +468,6 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) SLCALL_N(This->recorder, Destroy); if(This->player) SLCALL_N(This->player, Destroy); - if(This->outputmix) - SLCALL_N(This->outputmix, Destroy); if(This->initted){ EnterCriticalSection(&g_sessions_lock); @@ -776,7 +770,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, source.pFormat = &pcm; loc_outmix.locatorType = SL_DATALOCATOR_OUTPUTMIX; - loc_outmix.outputMix = This->outputmix; + loc_outmix.outputMix = outputmix; sink.pLocator = &loc_outmix; sink.pFormat = NULL;

1 0

Nikolay Sivov : shell32: Use regular helper to trace IID, downgrade QI failures to warnings.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: 709db66f8dd2ab1d937fd3196c7314d1b9bcd357 URL: http://source.winehq.org/git/wine.git/?a=commit;h=709db66f8dd2ab1d937fd3196… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 24 20:38:44 2017 +0300 shell32: Use regular helper to trace IID, downgrade QI failures to warnings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index da3031b..8742cb3 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -195,9 +195,7 @@ static HRESULT WINAPI FolderItemVerbImpl_QueryInterface(FolderItemVerb *iface, { FolderItemVerbImpl *This = impl_from_FolderItemVerb(iface); - TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); - - *ppv = NULL; + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IDispatch, riid) || @@ -205,7 +203,7 @@ static HRESULT WINAPI FolderItemVerbImpl_QueryInterface(FolderItemVerb *iface, *ppv = &This->FolderItemVerb_iface; else { - FIXME("not implemented for %s\n", shdebugstr_guid(riid)); + WARN("not implemented for %s\n", debugstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -367,9 +365,7 @@ static HRESULT WINAPI FolderItemVerbsImpl_QueryInterface(FolderItemVerbs *iface, { FolderItemVerbsImpl *This = impl_from_FolderItemVerbs(iface); - TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); - - *ppv = NULL; + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IDispatch, riid) || @@ -377,7 +373,7 @@ static HRESULT WINAPI FolderItemVerbsImpl_QueryInterface(FolderItemVerbs *iface, *ppv = &This->FolderItemVerbs_iface; else { - FIXME("not implemented for %s\n", shdebugstr_guid(riid)); + WARN("not implemented for %s\n", debugstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -623,7 +619,7 @@ static HRESULT WINAPI FolderItemImpl_QueryInterface(FolderItem2 *iface, { FolderItemImpl *This = impl_from_FolderItem(iface); - TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) return E_INVALIDARG; @@ -634,7 +630,7 @@ static HRESULT WINAPI FolderItemImpl_QueryInterface(FolderItem2 *iface, *ppv = &This->FolderItem2_iface; else { - FIXME("not implemented for %s\n", shdebugstr_guid(riid)); + WARN("not implemented for %s\n", debugstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -985,7 +981,7 @@ static HRESULT WINAPI FolderItemsImpl_QueryInterface(FolderItems3 *iface, { FolderItemsImpl *This = impl_from_FolderItems(iface); - TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) return E_INVALIDARG; @@ -997,7 +993,7 @@ static HRESULT WINAPI FolderItemsImpl_QueryInterface(FolderItems3 *iface, *ppv = &This->FolderItems3_iface; else { - FIXME("not implemented for %s\n", shdebugstr_guid(riid)); + WARN("not implemented for %s\n", debugstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -1314,7 +1310,7 @@ static HRESULT WINAPI FolderImpl_QueryInterface(Folder3 *iface, REFIID riid, { FolderImpl *This = impl_from_Folder(iface); - TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) return E_INVALIDARG; @@ -1326,7 +1322,7 @@ static HRESULT WINAPI FolderImpl_QueryInterface(Folder3 *iface, REFIID riid, *ppv = &This->Folder3_iface; else { - FIXME("not implemented for %s\n", shdebugstr_guid(riid)); + WARN("not implemented for %s\n", debugstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -1668,7 +1664,7 @@ static HRESULT WINAPI ShellDispatch_QueryInterface(IShellDispatch6 *iface, { ShellDispatch *This = impl_from_IShellDispatch6(iface); - TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) return E_INVALIDARG; @@ -1683,7 +1679,7 @@ static HRESULT WINAPI ShellDispatch_QueryInterface(IShellDispatch6 *iface, *ppv = &This->IShellDispatch6_iface; else { - FIXME("not implemented for %s\n", shdebugstr_guid(riid)); + WARN("not implemented for %s\n", debugstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : d2d1: Use the "world" position instead of the render target position in the pixel shader.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: 119f84099bccc8ecaa4905301e305257e9bc7006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=119f84099bccc8ecaa4905301… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Sep 23 13:37:01 2017 +0200 d2d1: Use the "world" position instead of the render target position in the pixel shader. This slightly simplifies the implementation of bitmap brushes, since the render target transformation no longer needs to be undone. More importantly, it does the same for gradient brushes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 15 +- dlls/d2d1/render_target.c | 494 +++++++++++++++++++++++++--------------------- 2 files changed, 275 insertions(+), 234 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=119f84099bccc8ecaa490…

1 0

Nikolay Sivov : shell32: Partially implement MapColumnToSCID().
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: f23edde42cf67ecc8b1ca09cbf82b1009b8eabc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f23edde42cf67ecc8b1ca09cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 25 10:59:36 2017 +0300 shell32: Partially implement MapColumnToSCID(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/cpanelfolder.c | 7 ++++--- dlls/shell32/shfldr.h | 5 +++++ dlls/shell32/shfldr_desktop.c | 25 +++++++++++++++---------- dlls/shell32/shfldr_fs.c | 25 +++++++++++++++---------- dlls/shell32/shfldr_mycomp.c | 23 ++++++++++++++--------- dlls/shell32/shfldr_netplaces.c | 17 ++++++++++------- dlls/shell32/shfldr_printers.c | 24 ++++++++++++++---------- dlls/shell32/shfldr_unixfs.c | 31 +++++++++++++++++-------------- dlls/shell32/shlfolder.c | 15 +++++++++++++++ 9 files changed, 109 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f23edde42cf67ecc8b1ca…

1 0

Hugh McMaster : regedit/tests: Use a helper function to delete registry values.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: 326fa95eabde59b21e6cac6c0523d81dc234a94b URL: http://source.winehq.org/git/wine.git/?a=commit;h=326fa95eabde59b21e6cac6c0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 25 06:58:23 2017 +0000 regedit/tests: Use a helper function to delete registry values. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index a660e9e..f97134e 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -241,6 +241,15 @@ static void add_value_(unsigned line, HKEY hkey, const char *name, DWORD type, lok(lr == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", lr); } +#define delete_value(k,n) delete_value_(__LINE__,k,n) +static void delete_value_(unsigned line, const HKEY hkey, const char *name) +{ + LONG lr; + + lr = RegDeleteValueA(hkey, name); + lok(lr == ERROR_SUCCESS, "RegDeleteValueA failed: %d\n", lr); +} + #define KEY_BASE "Software\\Wine\\regedit_test" static void test_basic_import(void) @@ -1532,8 +1541,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine28c"); verify_reg(hkey, NULL, REG_SZ, "Default value 3", 16, 0); - lr = RegDeleteValueW(hkey, NULL); - ok(lr == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", lr); + delete_value(hkey, NULL); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2037,8 +2045,7 @@ static void test_invalid_import_unicode(void) verify_reg_nonexist(hkey, "Wine28c"); verify_reg(hkey, NULL, REG_SZ, "Default value 3", 16, 0); - lr = RegDeleteValueW(hkey, NULL); - ok(lr == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", lr); + delete_value(hkey, NULL); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : reg/tests: Test registry export against order of data creation.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: 08a2a019748adf853be1103c333c248e648dc0a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a2a019748adf853be1103c3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 25 06:55:49 2017 +0000 reg/tests: Test registry export against order of data creation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 36cb6ed..dca5f78 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4336,6 +4336,18 @@ static void test_export(void) "@=dword:12345678\r\n" "\"43981\"=hex(abcd):56,61,6c,75,65,00\r\n\r\n"; + const char *key_order_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1]\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2]\r\n\r\n"; + + const char *value_order_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"Value 2\"=\"I was added first!\"\r\n" + "\"Value 1\"=\"I was added second!\"\r\n\r\n"; + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); @@ -4456,6 +4468,43 @@ static void test_export(void) err = delete_tree(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS, "delete_tree() failed: %d\n", err); + + /* Test the export order of registry keys */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + add_key(hkey, "Subkey2", &subkey); + RegCloseKey(subkey); + add_key(hkey, "Subkey1", &subkey); + RegCloseKey(subkey); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", key_order_test), "compare_export() failed\n"); + + err = DeleteFileA("file.reg"); + todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); + + err = RegDeleteKeyA(hkey, "Subkey1"); + ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err); + err = RegDeleteKeyA(hkey, "Subkey2"); + ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err); + + /* Test the export order of registry values. Windows exports registry values + * in order of creation; Wine uses alphabetical order. + */ + add_value(hkey, "Value 2", REG_SZ, "I was added first!", 19); + add_value(hkey, "Value 1", REG_SZ, "I was added second!", 20); + + RegCloseKey(hkey); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", value_order_test), "compare_export() failed\n"); + + err = DeleteFileA("file.reg"); + todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); + + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err); } START_TEST(reg)

1 0

Fabian Maurer : evr/tests: Run the tests with todo_wine instead of skipping them.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: 1c67258dbf2e0c2ae399bf3ef8a027fe74e9a002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c67258dbf2e0c2ae399bf3ef… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Sep 23 17:21:16 2017 +0200 evr/tests: Run the tests with todo_wine instead of skipping them. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/Makefile.in | 2 +- dlls/evr/tests/filter.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/evr/tests/Makefile.in b/dlls/evr/tests/Makefile.in index c370646..5ee4f84 100644 --- a/dlls/evr/tests/Makefile.in +++ b/dlls/evr/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = evr.dll -IMPORTS = mfuuid strmiids strmbase uuid ole32 oleaut32 +IMPORTS = mfuuid strmiids uuid ole32 oleaut32 C_SRCS = \ filter.c diff --git a/dlls/evr/tests/filter.c b/dlls/evr/tests/filter.c index 4f82b14..3bae738 100644 --- a/dlls/evr/tests/filter.c +++ b/dlls/evr/tests/filter.c @@ -83,8 +83,8 @@ static void test_aggregation(const CLSID clsid_inner, const IID iid_inner, const /* aggregation, request IUnknown */ hr = CoCreateInstance(&clsid_inner, unk_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (LPVOID*)&unk_inner); - ok(hr == S_OK, "%s: run %d: Third CoCreateInstance returned %x\n", testid, testrun, hr); - ok(unk_inner != NULL, "%s: run %d: unk_inner is NULL\n", testid, testrun); + todo_wine ok(hr == S_OK, "%s: run %d: Third CoCreateInstance returned %x\n", testid, testrun, hr); + todo_wine ok(unk_inner != NULL, "%s: run %d: unk_inner is NULL\n", testid, testrun); if (!unk_inner) { @@ -163,12 +163,6 @@ static void test_evr_filter_aggregations(void) }; int i; - if(!strcmp(winetest_platform, "wine")) - { - skip("Not supported yet.\n"); - return; - } - for (i = 0; i < sizeof(iids) / sizeof(iids[0]); i++) { test_aggregation(CLSID_EnhancedVideoRenderer, *iids[i], "filter", i);

1 0

Nikolay Sivov : msvcr120: Added vsscanf() and vswscanf().
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: 1b2554c2c3cf06cd89cf54014153d61c59feb816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b2554c2c3cf06cd89cf54014… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 23 20:16:45 2017 +0300 msvcr120: Added vsscanf() and vswscanf(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120/tests/msvcr120.c | 26 ++++++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/scanf.c | 20 ++++++++++++++++++++ 4 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c091bd1..ad25b17 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2436,10 +2436,10 @@ @ stub vscanf_s @ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf @ cdecl vsprintf_s(ptr long str ptr) MSVCRT_vsprintf_s -@ stub vsscanf +@ cdecl vsscanf(ptr str ptr) MSVCRT_vsscanf @ stub vsscanf_s @ cdecl vswprintf_s(ptr long wstr ptr) MSVCRT_vswprintf_s -@ stub vswscanf +@ cdecl vswscanf(ptr wstr ptr) MSVCRT_vswscanf @ stub vswscanf_s @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf @ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index de0ccc4..7a6e696 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -183,6 +183,7 @@ static int (CDECL *p__clearfp)(void); static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); static void (__cdecl *p_free_locale)(_locale_t); static unsigned short (__cdecl *p_wctype)(const char*); +static int (__cdecl *p_vsscanf)(const char*, const char *, __ms_va_list valist); /* make sure we use the correct errno */ #undef errno @@ -240,6 +241,7 @@ static BOOL init(void) SET(p_wctype, "wctype"); SET(p_fegetenv, "fegetenv"); SET(p__clearfp, "_clearfp"); + SET(p_vsscanf, "vsscanf"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QEAA(a)XZ"); @@ -911,6 +913,29 @@ static void test_wctype(void) } } +static int __cdecl _vsscanf_wrapper(const char *buffer, const char *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p_vsscanf(buffer, format, valist); + __ms_va_end(valist); + return ret; +} + +static void test_vsscanf(void) +{ + static const char *fmt = "%d"; + char buff[16]; + int ret, v; + + v = 0; + strcpy(buff, "10"); + ret = _vsscanf_wrapper(buff, fmt, &v); + ok(ret == 1, "Unexpected ret %d.\n", ret); + ok(v == 10, "got %d.\n", v); +} + START_TEST(msvcr120) { if (!init()) return; @@ -928,4 +953,5 @@ START_TEST(msvcr120) test__wcreate_locale(); test__Condition_variable(); test_wctype(); + test_vsscanf(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 0193282..b37ab32 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -2098,10 +2098,10 @@ @ stub vscanf_s @ cdecl vsprintf(ptr str ptr) msvcr120.vsprintf @ cdecl vsprintf_s(ptr long str ptr) msvcr120.vsprintf_s -@ stub vsscanf +@ cdecl vsscanf(ptr str ptr) msvcr120.vsscanf @ stub vsscanf_s @ cdecl vswprintf_s(ptr long wstr ptr) msvcr120.vswprintf_s -@ stub vswscanf +@ cdecl vswscanf(ptr wstr ptr) msvcr120.vswscanf @ stub vswscanf_s @ cdecl vwprintf(wstr ptr) msvcr120.vwprintf @ cdecl vwprintf_s(wstr ptr) msvcr120.vwprintf_s diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index fd776a6..63ff8b1 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -795,3 +795,23 @@ int CDECL MSVCRT__snwscanf_s_l(MSVCRT_wchar_t *input, MSVCRT_size_t length, __ms_va_end(valist); return res; } + +/********************************************************************* + * vsscanf (MSVCRT120.@) + */ +int CDECL MSVCRT_vsscanf(const char *buffer, const char *format, __ms_va_list valist) +{ + if (!MSVCRT_CHECK_PMT(buffer != NULL && format != NULL)) return -1; + + return MSVCRT_vsscanf_l(buffer, format, NULL, valist); +} + +/********************************************************************* + * vswscanf (MSVCRT120.@) + */ +int CDECL MSVCRT_vswscanf(const MSVCRT_wchar_t *buffer, const MSVCRT_wchar_t *format, __ms_va_list valist) +{ + if (!MSVCRT_CHECK_PMT(buffer != NULL && format != NULL)) return -1; + + return MSVCRT_vswscanf_l(buffer, format, NULL, valist); +}

1 0

Alistair Leslie-Hughes : include: Add uianimation.idl.
by Alexandre Julliard Sept. 25, 2017

Sept. 25, 2017

Module: wine Branch: master Commit: 9463c52df695d0bb0b212b34136c302f4379b4e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9463c52df695d0bb0b212b341… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 22 02:14:01 2017 +0000 include: Add uianimation.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/uianimation.idl | 242 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 243 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 236d2bd..71e25ca 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -172,6 +172,7 @@ IDL_SRCS = \ transact.idl \ txcoord.idl \ txdtc.idl \ + uianimation.idl \ uiautomationclient.idl \ uiautomationcore.idl \ uiribbon.idl \ diff --git a/include/uianimation.idl b/include/uianimation.idl new file mode 100644 index 0000000..1c17d44 --- /dev/null +++ b/include/uianimation.idl @@ -0,0 +1,242 @@ +/* + * Copyright 2017 Alistair Leslie-Hughes + * + * 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 + */ +import "wtypes.idl"; +import "unknwn.idl"; + +interface IUIAnimationStoryboard; +interface IUIAnimationVariable; + +typedef DOUBLE UI_ANIMATION_SECONDS; +typedef struct { int _; } *UI_ANIMATION_KEYFRAME; + +typedef enum +{ + UI_ANIMATION_MANAGER_IDLE, + UI_ANIMATION_MANAGER_BUSY +} UI_ANIMATION_MANAGER_STATUS; + +typedef enum +{ + UI_ANIMATION_ROUNDING_NEAREST, + UI_ANIMATION_ROUNDING_FLOOR, + UI_ANIMATION_ROUNDING_CEILING +} UI_ANIMATION_ROUNDING_MODE; + +typedef enum +{ + UI_ANIMATION_SCHEDULING_UNEXPECTED_FAILURE, + UI_ANIMATION_SCHEDULING_INSUFFICIENT_PRIORITY, + UI_ANIMATION_SCHEDULING_ALREADY_SCHEDULED, + UI_ANIMATION_SCHEDULING_SUCCEEDED, + UI_ANIMATION_SCHEDULING_DEFERRED +} UI_ANIMATION_SCHEDULING_RESULT; + +typedef enum +{ + UI_ANIMATION_STORYBOARD_BUILDING, + UI_ANIMATION_STORYBOARD_SCHEDULED, + UI_ANIMATION_STORYBOARD_CANCELLED, + UI_ANIMATION_STORYBOARD_PLAYING, + UI_ANIMATION_STORYBOARD_TRUNCATED, + UI_ANIMATION_STORYBOARD_FINISHED, + UI_ANIMATION_STORYBOARD_READY, + UI_ANIMATION_STORYBOARD_INSUFFICIENT_PRIORITY +} UI_ANIMATION_STORYBOARD_STATUS; + +[ + local, + object, + uuid(783321ed-78a3-4366-b574-6af607a64788), + pointer_default(unique) +] +interface IUIAnimationManagerEventHandler : IUnknown +{ + HRESULT OnManagerStatusChanged ( + [in] UI_ANIMATION_MANAGER_STATUS status, + [in] UI_ANIMATION_MANAGER_STATUS prev_status); +} + +[ + local, + object, + uuid(6358b7ba-87d2-42d5-bf71-82e919dd5862), + pointer_default(unique) +] +interface IUIAnimationVariableChangeHandler : IUnknown +{ + HRESULT OnValueChanged ( + [in] IUIAnimationStoryboard *storyboard, + [in] IUIAnimationVariable *variable, + [in] DOUBLE value, + [in] DOUBLE prev_value); +} + +[ + local, + object, + uuid(bb3e1550-356e-44b0-99da-85ac6017865e), + pointer_default(unique) +] +interface IUIAnimationVariableIntegerChangeHandler : IUnknown +{ + HRESULT OnIntegerValueChanged ( + [in] IUIAnimationStoryboard *storyboard, + [in] IUIAnimationVariable *variable, + [in] INT32 value, + [in] INT32 prev_value); +} + +[ + local, + object, + uuid(3d5c9008-ec7c-4364-9f8a-9af3c58cbae6), + pointer_default(unique) +] +interface IUIAnimationStoryboardEventHandler : IUnknown +{ + HRESULT OnStoryboardStatusChanged ( + [in] IUIAnimationStoryboard *storyboard, + [in] UI_ANIMATION_STORYBOARD_STATUS status, + [in] UI_ANIMATION_STORYBOARD_STATUS prev_status); + + HRESULT OnStoryboardUpdated ([in] IUIAnimationStoryboard *storyboard); +} + +[ + local, + object, + uuid(dc6ce252-f731-41cf-b610-614b6ca049ad), + pointer_default(unique) +] +interface IUIAnimationTransition : IUnknown +{ + HRESULT SetInitialValue ([in] DOUBLE value); + + HRESULT SetInitialVelocity ([in] DOUBLE velocity); + + HRESULT IsDurationKnown (); + + HRESULT GetDuration ([out, retval] UI_ANIMATION_SECONDS *duration); +} + +[ + local, + object, + uuid(8ceeb155-2849-4ce5-9448-91ff70e1e4d9), + pointer_default(unique) +] +interface IUIAnimationVariable : IUnknown +{ + HRESULT GetValue ([out, retval] DOUBLE *value); + + HRESULT GetFinalValue ([out, retval] DOUBLE *value); + + HRESULT GetPreviousValue ([out, retval] DOUBLE *value); + + HRESULT GetIntegerValue ([out, retval] INT32 *value); + + HRESULT GetFinalIntegerValue ([out, retval] INT32 *value); + + HRESULT GetPreviousIntegerValue ([out, retval] INT32 *value); + + HRESULT GetCurrentStoryboard ([out, retval] IUIAnimationStoryboard **storyboard); + + HRESULT SetLowerBound ([in] DOUBLE bound); + + HRESULT SetUpperBound ([in] DOUBLE bound); + + HRESULT SetRoundingMode ([in] UI_ANIMATION_ROUNDING_MODE mode); + + HRESULT SetTag ( + [in] IUnknown *object, + [in] UINT32 id); + + HRESULT GetTag ( + [out] IUnknown **object, + [out] UINT32 *id); + + HRESULT SetVariableChangeHandler ([in, unique] IUIAnimationVariableChangeHandler *handler); + + HRESULT SetVariableIntegerChangeHandler ([in, unique] IUIAnimationVariableIntegerChangeHandler *handler); +} + +[ + local, + object, + uuid(a8ff128f-9bf9-4af1-9e67-e5e410defb84), + pointer_default(unique) +] +interface IUIAnimationStoryboard : IUnknown +{ + HRESULT AddTransition ( + [in] IUIAnimationVariable *variable, + [in] IUIAnimationTransition *transition); + + HRESULT AddKeyframeAtOffset ( + [in] UI_ANIMATION_KEYFRAME existingframe, + [in] UI_ANIMATION_SECONDS offset, + [out, retval] UI_ANIMATION_KEYFRAME *keyframe); + + HRESULT AddKeyframeAfterTransition ( + [in] IUIAnimationTransition *transition, + [out, retval] UI_ANIMATION_KEYFRAME *keyframe); + + HRESULT AddTransitionAtKeyframe ( + [in] IUIAnimationVariable *variable, + [in] IUIAnimationTransition *transition, + [in] UI_ANIMATION_KEYFRAME start_key); + + HRESULT AddTransitionBetweenKeyframes ( + [in] IUIAnimationVariable *variable, + [in] IUIAnimationTransition *transition, + [in] UI_ANIMATION_KEYFRAME start_key, + [in] UI_ANIMATION_KEYFRAME end_key); + + HRESULT RepeatBetweenKeyframes ( + [in] UI_ANIMATION_KEYFRAME start_key, + [in] UI_ANIMATION_KEYFRAME end_key, + [in] INT32 count); + + HRESULT HoldVariable ([in] IUIAnimationVariable *variable); + + HRESULT SetLongestAcceptableDelay ([in] UI_ANIMATION_SECONDS delay); + + HRESULT Schedule ( + [in] UI_ANIMATION_SECONDS now, + [out, defaultvalue(0)] UI_ANIMATION_SCHEDULING_RESULT *result); + + HRESULT Conclude (); + + HRESULT Finish ([in] UI_ANIMATION_SECONDS deadline); + + HRESULT Abandon (); + + HRESULT SetTag( + [in, unique] IUnknown *object, + [in] UINT32 id); + + HRESULT GetTag ( + [out] IUnknown **object, + [out] UINT32 *id); + + HRESULT GetStatus ([out, retval] UI_ANIMATION_STORYBOARD_STATUS *status); + + HRESULT GetElapsedTime ([out] UI_ANIMATION_SECONDS *elapsed); + + HRESULT SetStoryboardEventHandler ([in, unique] IUIAnimationStoryboardEventHandler *handler); +}

1 0