December 2013 - Wine-commits

Jacek Caban : msrle32/tests: Added tests.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 754e621613c3a9ff30916e59137656b226e95e30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=754e621613c3a9ff30916e591… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 30 11:53:18 2013 +0100 msrle32/tests: Added tests. --- configure | 1 + configure.ac | 1 + dlls/msrle32/tests/Makefile.in | 5 ++++ dlls/msrle32/tests/msrle.c | 48 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 10dea9a..a3c36ce 100755 --- a/configure +++ b/configure @@ -16976,6 +16976,7 @@ wine_fn_config_dll msls31 enable_msls31 wine_fn_config_dll msnet32 enable_msnet32 wine_fn_config_dll mspatcha enable_mspatcha wine_fn_config_dll msrle32 enable_msrle32 po +wine_fn_config_test dlls/msrle32/tests msrle32_test wine_fn_config_dll mssign32 enable_mssign32 wine_fn_config_dll mssip32 enable_mssip32 wine_fn_config_dll mstask enable_mstask clean diff --git a/configure.ac b/configure.ac index afec9bb..964c068 100644 --- a/configure.ac +++ b/configure.ac @@ -3019,6 +3019,7 @@ WINE_CONFIG_DLL(msls31) WINE_CONFIG_DLL(msnet32) WINE_CONFIG_DLL(mspatcha) WINE_CONFIG_DLL(msrle32,,[po]) +WINE_CONFIG_TEST(dlls/msrle32/tests) WINE_CONFIG_DLL(mssign32) WINE_CONFIG_DLL(mssip32) WINE_CONFIG_DLL(mstask,,[clean]) diff --git a/dlls/msrle32/tests/Makefile.in b/dlls/msrle32/tests/Makefile.in new file mode 100644 index 0000000..fafc2da --- /dev/null +++ b/dlls/msrle32/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = msrle32.dll +IMPORTS = msvfw32 +C_SRCS = msrle.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c new file mode 100644 index 0000000..04cf64f --- /dev/null +++ b/dlls/msrle32/tests/msrle.c @@ -0,0 +1,48 @@ +/* + * Copyright 2013 Jacek Caban for CodeWeavers + * + * 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 + */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#include <vfw.h> +#include <aviriff.h> + +#include "wine/test.h" + +static void test_encode(void) +{ + ICINFO info; + HIC hic; + LRESULT res; + + hic = ICOpen(FCC('V','I','D','C'), FCC('m','r','l','e'), ICMODE_COMPRESS); + ok(hic != NULL, "ICOpen failed\n"); + + res = ICGetInfo(hic, &info, sizeof(info)); + ok(res == sizeof(info), "res = %ld\n", res); + ok(info.dwSize == sizeof(info), "dwSize = %d\n", info.dwSize); + ok(info.fccHandler == FCC('M','R','L','E'), "fccHandler = %x\n", info.fccHandler); + todo_wine ok(info.dwFlags == (VIDCF_QUALITY|VIDCF_CRUNCH|VIDCF_TEMPORAL), "dwFlags = %x\n", info.dwFlags); + ok(info.dwVersionICM == ICVERSION, "dwVersionICM = %d\n", info.dwVersionICM); + + ICClose(hic); +} + +START_TEST(msrle) +{ + test_encode(); +}

1 0

Alexandre Julliard : gdi32: Don' t bother returning the driver module from DRIVER_load_driver.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 7c3bb6070a844fa9336c67d58d95fe28ad4778c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c3bb6070a844fa9336c67d58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 30 17:42:48 2013 +0100 gdi32: Don't bother returning the driver module from DRIVER_load_driver. --- dlls/gdi32/dc.c | 3 +-- dlls/gdi32/driver.c | 17 +++++------------ dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 9d3af57..ba869f1 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -625,7 +625,6 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, HDC hdc; DC * dc; const struct gdi_dc_funcs *funcs; - HMODULE module; WCHAR buf[300]; GDI_CheckNotLock(); @@ -640,7 +639,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, strcpyW(buf, driver); } - if (!(funcs = DRIVER_load_driver( buf, &module ))) + if (!(funcs = DRIVER_load_driver( buf ))) { ERR( "no driver found for %s\n", debugstr_w(buf) ); return 0; diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 750ef11..31703fe 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -91,7 +91,7 @@ static struct graphics_driver *create_driver( HMODULE module ) * * Special case for loading the display driver: get the name from the config file */ -static const struct gdi_dc_funcs *get_display_driver( HMODULE *module_ret ) +static const struct gdi_dc_funcs *get_display_driver(void) { if (!display_driver) { @@ -104,8 +104,6 @@ static const struct gdi_dc_funcs *get_display_driver( HMODULE *module_ret ) __wine_set_display_driver( 0 ); } } - - *module_ret = display_driver->module; return display_driver->funcs; } @@ -113,7 +111,7 @@ static const struct gdi_dc_funcs *get_display_driver( HMODULE *module_ret ) /********************************************************************** * DRIVER_load_driver */ -const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name, HMODULE *module_ret ) +const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) { HMODULE module; struct graphics_driver *driver, *new_driver; @@ -121,16 +119,12 @@ const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name, HMODULE *module_ret static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; /* display driver is a special case */ - if (!strcmpiW( name, displayW ) || !strcmpiW( name, display1W )) - return get_display_driver( module_ret ); + if (!strcmpiW( name, displayW ) || !strcmpiW( name, display1W )) return get_display_driver(); if ((module = GetModuleHandleW( name ))) { - if (display_driver && display_driver->module == module) - { - *module_ret = module; - return display_driver->funcs; - } + if (display_driver && display_driver->module == module) return display_driver->funcs; + EnterCriticalSection( &driver_section ); LIST_FOR_EACH_ENTRY( driver, &drivers, struct graphics_driver, entry ) { @@ -160,7 +154,6 @@ const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name, HMODULE *module_ret list_add_head( &drivers, &driver->entry ); TRACE( "loaded driver %p for %s\n", driver, debugstr_w(name) ); done: - *module_ret = driver->module; LeaveCriticalSection( &driver_section ); return driver->funcs; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 1d90f6c..430e652 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -268,7 +268,7 @@ extern const struct gdi_dc_funcs null_driver DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs dib_driver DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs path_driver DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs *font_driver DECLSPEC_HIDDEN; -extern const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name, HMODULE *module ) DECLSPEC_HIDDEN; +extern const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HIDDEN; extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DECLSPEC_HIDDEN; /* enhmetafile.c */

1 0

Alexandre Julliard : gdi32: Trigger the display driver load for CreateCompatibleDC(0).
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 200eb1d30b8801ad022c4f5dfd32f0e19c313774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=200eb1d30b8801ad022c4f5df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 30 17:43:29 2013 +0100 gdi32: Trigger the display driver load for CreateCompatibleDC(0). --- dlls/gdi32/dc.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index ba869f1..9500de2 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -739,7 +739,7 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) { DC *dc, *origDC; HDC ret; - const struct gdi_dc_funcs *funcs = &null_driver; + const struct gdi_dc_funcs *funcs; PHYSDEV physDev = NULL; GDI_CheckNotLock(); @@ -751,6 +751,7 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) funcs = physDev->funcs; release_dc_ptr( origDC ); } + else funcs = DRIVER_load_driver( displayW ); if (!(dc = alloc_dc_ptr( OBJ_MEMDC ))) return 0; @@ -765,7 +766,7 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) ret = dc->hSelf; - if (!funcs->pCreateCompatibleDC( physDev, &dc->physDev )) + if (funcs->pCreateCompatibleDC && !funcs->pCreateCompatibleDC( physDev, &dc->physDev )) { WARN("creation aborted by device\n"); free_dc_ptr( dc );

1 0

Alexandre Julliard : scrrun: Add missing ITextStream id.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: e03bfb482f87a6a0ee24dfb7d4a5eb2d9037ae80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e03bfb482f87a6a0ee24dfb7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 30 17:49:31 2013 +0100 scrrun: Add missing ITextStream id. --- dlls/scrrun/scrrun.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index 82f494f..3739e30 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -105,6 +105,7 @@ static REFIID tid_ids[] = { &IID_IDictionary, &IID_IFileSystem3, &IID_IFolder, + &IID_ITextStream, &IID_IFile };

1 0

Dmitry Timoshkov : advapi32/tests: Test generic access mapping for a mutex.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 8caa9f351dd7d7cc4b22b7fcb50bb32c9a2e4a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8caa9f351dd7d7cc4b22b7fcb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 26 16:34:05 2013 +0900 advapi32/tests: Test generic access mapping for a mutex. --- dlls/advapi32/tests/security.c | 46 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4de588f..0727130 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4499,13 +4499,37 @@ todo_wine { HeapFree(GetProcessHeap(), 0, sd); } +static ACCESS_MASK get_obj_access(HANDLE obj) +{ + OBJECT_BASIC_INFORMATION info; + NTSTATUS status; + + if (!pNtQueryObject) return 0; + + status = pNtQueryObject(obj, ObjectBasicInformation, &info, sizeof(info), NULL); + ok(!status, "NtQueryObject error %#x\n", status); + + return info.GrantedAccess; +} + static void test_mutex_security(HANDLE token) { - HANDLE mutex; + DWORD ret, i, access; + HANDLE mutex, dup; GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ | MUTANT_QUERY_STATE | SYNCHRONIZE, STANDARD_RIGHTS_WRITE | MUTEX_MODIFY_STATE | SYNCHRONIZE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, STANDARD_RIGHTS_ALL | MUTEX_ALL_ACCESS }; + static const struct + { + int todo, generic, mapped; + } map[] = + { + { 1, GENERIC_READ, STANDARD_RIGHTS_READ | MUTANT_QUERY_STATE }, + { 0, GENERIC_WRITE, STANDARD_RIGHTS_WRITE }, + { 0, GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE }, + { 0, GENERIC_ALL, STANDARD_RIGHTS_ALL | MUTANT_QUERY_STATE } + }; SetLastError(0xdeadbeef); mutex = OpenMutexA(0, FALSE, "WineTestMutex"); @@ -4516,6 +4540,26 @@ static void test_mutex_security(HANDLE token) mutex = CreateMutexA(NULL, FALSE, "WineTestMutex"); ok(mutex != 0, "CreateMutex error %d\n", GetLastError()); + access = get_obj_access(mutex); + ok(access == MUTANT_ALL_ACCESS, "expected MUTANT_ALL_ACCESS, got %#x\n", access); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), mutex, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + if (map[i].todo) +todo_wine + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + else + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + + CloseHandle(dup); + } + test_default_handle_security(token, mutex, &mapping); CloseHandle (mutex);

1 0

Dmitry Timoshkov : advapi32/tests: Test generic access mapping for an event .
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 3fa43b6b651de1d4df80150643aeb8098271cd1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa43b6b651de1d4df8015064… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 26 16:34:10 2013 +0900 advapi32/tests: Test generic access mapping for an event. --- dlls/advapi32/tests/security.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 0727130..10eea5f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4567,11 +4567,22 @@ todo_wine static void test_event_security(HANDLE token) { - HANDLE event; + DWORD ret, i, access; + HANDLE event, dup; GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ | EVENT_QUERY_STATE | SYNCHRONIZE, STANDARD_RIGHTS_WRITE | EVENT_MODIFY_STATE | SYNCHRONIZE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, STANDARD_RIGHTS_ALL | EVENT_ALL_ACCESS }; + static const struct + { + int todo, generic, mapped; + } map[] = + { + { 1, GENERIC_READ, STANDARD_RIGHTS_READ | EVENT_QUERY_STATE }, + { 1, GENERIC_WRITE, STANDARD_RIGHTS_WRITE | EVENT_MODIFY_STATE }, + { 1, GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE }, + { 0, GENERIC_ALL, STANDARD_RIGHTS_ALL | EVENT_QUERY_STATE | EVENT_MODIFY_STATE } + }; SetLastError(0xdeadbeef); event = OpenEventA(0, FALSE, "WineTestEvent"); @@ -4582,6 +4593,26 @@ static void test_event_security(HANDLE token) event = CreateEventA(NULL, FALSE, FALSE, "WineTestEvent"); ok(event != 0, "CreateEvent error %d\n", GetLastError()); + access = get_obj_access(event); + ok(access == EVENT_ALL_ACCESS, "expected EVENT_ALL_ACCESS, got %#x\n", access); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), event, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + if (map[i].todo) +todo_wine + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + else + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + + CloseHandle(dup); + } + test_default_handle_security(token, event, &mapping); CloseHandle(event);

1 0

Dmitry Timoshkov : advapi32/tests: Test generic access mapping for a semaphore.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 8b91e6e41e67cdf0bc7a70dfc7d268ba0d5b7cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b91e6e41e67cdf0bc7a70dfc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 26 16:34:14 2013 +0900 advapi32/tests: Test generic access mapping for a semaphore. --- dlls/advapi32/tests/security.c | 58 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 10eea5f..b69a5ac 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -42,6 +42,10 @@ #define EVENT_QUERY_STATE 0x0001 #endif +#ifndef SEMAPHORE_QUERY_STATE +#define SEMAPHORE_QUERY_STATE 0x0001 +#endif + /* copied from Wine winternl.h - not included in the Windows SDK */ typedef enum _OBJECT_INFORMATION_CLASS { ObjectBasicInformation, @@ -4618,6 +4622,59 @@ todo_wine CloseHandle(event); } +static void test_semaphore_security(HANDLE token) +{ + DWORD ret, i, access; + HANDLE sem, dup; + GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ | SEMAPHORE_QUERY_STATE, + STANDARD_RIGHTS_WRITE | SEMAPHORE_MODIFY_STATE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, + STANDARD_RIGHTS_ALL | SEMAPHORE_ALL_ACCESS }; + static const struct + { + int todo, generic, mapped; + } map[] = + { + { 1, GENERIC_READ, STANDARD_RIGHTS_READ | SEMAPHORE_QUERY_STATE }, + { 0, GENERIC_WRITE, STANDARD_RIGHTS_WRITE | SEMAPHORE_MODIFY_STATE }, + { 1, GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE }, + { 0, GENERIC_ALL, STANDARD_RIGHTS_ALL | SEMAPHORE_QUERY_STATE | SEMAPHORE_MODIFY_STATE } + }; + + SetLastError(0xdeadbeef); + sem = OpenSemaphoreA(0, FALSE, "WineTestSemaphore"); + ok(!sem, "semaphore should not exist\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + sem = CreateSemaphoreA(NULL, 0, 10, "WineTestSemaphore"); + ok(sem != 0, "CreateSemaphore error %d\n", GetLastError()); + + access = get_obj_access(sem); + ok(access == SEMAPHORE_ALL_ACCESS, "expected SEMAPHORE_ALL_ACCESS, got %#x\n", access); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), sem, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + if (map[i].todo) +todo_wine + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + else + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + + CloseHandle(dup); + } + + test_default_handle_security(token, sem, &mapping); + + CloseHandle(sem); +} + #define WINE_TEST_PIPE "\\\\.\\pipe\\WineTestPipe" static void test_named_pipe_security(HANDLE token) { @@ -4721,6 +4778,7 @@ static void test_kernel_objects_security(void) test_mutex_security(token); test_event_security(token); test_named_pipe_security(token); + test_semaphore_security(token); /* FIXME: test other kernel object types */ CloseHandle(process_token);

1 0

Dmitry Timoshkov : advapi32/tests: Test generic access mapping for a pipe.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 683a1dc943866b77bd9f67366ae53befd769b3ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=683a1dc943866b77bd9f67366… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 26 16:34:18 2013 +0900 advapi32/tests: Test generic access mapping for a pipe. --- dlls/advapi32/tests/security.c | 55 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b69a5ac..cce1339 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4678,11 +4678,22 @@ todo_wine #define WINE_TEST_PIPE "\\\\.\\pipe\\WineTestPipe" static void test_named_pipe_security(HANDLE token) { - HANDLE pipe, file; + DWORD ret, i, access; + HANDLE pipe, file, dup; GENERIC_MAPPING mapping = { FILE_GENERIC_READ, FILE_GENERIC_WRITE, FILE_GENERIC_EXECUTE, STANDARD_RIGHTS_ALL | FILE_ALL_ACCESS }; + static const struct + { + int todo, generic, mapped; + } map[] = + { + { 1, GENERIC_READ, FILE_GENERIC_READ }, + { 1, GENERIC_WRITE, FILE_GENERIC_WRITE }, + { 1, GENERIC_EXECUTE, FILE_GENERIC_EXECUTE }, + { 1, GENERIC_ALL, STANDARD_RIGHTS_ALL | FILE_ALL_ACCESS } + }; SetLastError(0xdeadbeef); pipe = CreateNamedPipeA(WINE_TEST_PIPE, PIPE_ACCESS_DUPLEX | FILE_FLAG_FIRST_PIPE_INSTANCE, @@ -4695,13 +4706,53 @@ static void test_named_pipe_security(HANDLE token) SetLastError(0xdeadbeef); file = CreateFileA(WINE_TEST_PIPE, FILE_ALL_ACCESS, 0, NULL, OPEN_EXISTING, 0, 0); ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); - CloseHandle(file); + access = get_obj_access(file); + ok(access == FILE_ALL_ACCESS, "expected FILE_ALL_ACCESS, got %#x\n", access); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), file, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + + CloseHandle(dup); + } + + CloseHandle(file); CloseHandle(pipe); SetLastError(0xdeadbeef); file = CreateFileA("\\\\.\\pipe\\", FILE_ALL_ACCESS, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); ok(file != INVALID_HANDLE_VALUE || broken(file == INVALID_HANDLE_VALUE) /* before Vista */, "CreateFile error %d\n", GetLastError()); + + if (file != INVALID_HANDLE_VALUE) + { + access = get_obj_access(file); + ok(access == FILE_ALL_ACCESS, "expected FILE_ALL_ACCESS, got %#x\n", access); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), file, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + if (map[i].todo) +todo_wine + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + else + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + + CloseHandle(dup); + } + } + CloseHandle(file); }

1 0

Dmitry Timoshkov : advapi32/tests: Test generic access mapping for a file.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 2d05a633905175afc341fad52c6a1349e7fa2493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d05a633905175afc341fad52… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 26 16:34:22 2013 +0900 advapi32/tests: Test generic access mapping for a file. --- dlls/advapi32/tests/security.c | 45 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index cce1339..9f1e611 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4756,6 +4756,50 @@ todo_wine CloseHandle(file); } +static void test_file_security(HANDLE token) +{ + DWORD ret, i, access; + HANDLE file, dup; + static const struct + { + int generic, mapped; + } map[] = + { + { GENERIC_READ, FILE_GENERIC_READ }, + { GENERIC_WRITE, FILE_GENERIC_WRITE }, + { GENERIC_EXECUTE, FILE_GENERIC_EXECUTE }, + { GENERIC_ALL, STANDARD_RIGHTS_ALL | FILE_ALL_ACCESS } + }; + char temp_path[MAX_PATH]; + char file_name[MAX_PATH]; + + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "tmp", 0, file_name); + + SetLastError(0xdeadbeef); + file = CreateFileA(file_name, GENERIC_ALL, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + access = get_obj_access(file); + ok(access == FILE_ALL_ACCESS, "expected FILE_ALL_ACCESS, got %#x\n", access); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), file, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + + CloseHandle(dup); + } + + CloseHandle(file); + DeleteFileA(file_name); +} + static BOOL validate_impersonation_token(HANDLE token, DWORD *token_type) { DWORD ret, needed; @@ -4830,6 +4874,7 @@ static void test_kernel_objects_security(void) test_event_security(token); test_named_pipe_security(token); test_semaphore_security(token); + test_file_security(token); /* FIXME: test other kernel object types */ CloseHandle(process_token);

1 0

Jacek Caban : qcap: Added IPersistPropertyBag stub implementation to AVI compressor.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: cd90d8fdd84d5199fa15baf8f115816871cd904b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd90d8fdd84d5199fa15baf8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 30 16:37:47 2013 +0100 qcap: Added IPersistPropertyBag stub implementation to AVI compressor. --- dlls/qcap/avico.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/qcap/tests/qcap.c | 9 ++++++ 2 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index a24a1c3..6817bf6 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); typedef struct { BaseFilter filter; + IPersistPropertyBag IPersistPropertyBag_iface; } AVICompressor; static inline AVICompressor *impl_from_BaseFilter(BaseFilter *filter) @@ -61,6 +62,9 @@ static HRESULT WINAPI AVICompressor_QueryInterface(IBaseFilter *iface, REFIID ri }else if(IsEqualIID(riid, &IID_IBaseFilter)) { TRACE("(%p)->(IID_IBaseFilter %p)\n", This, ppv); *ppv = &This->filter.IBaseFilter_iface; + }else if(IsEqualIID(riid, &IID_IPersistPropertyBag)) { + TRACE("(%p)->(IID_IPersistPropertyBag %p)\n", This, ppv); + *ppv = &This->IPersistPropertyBag_iface; }else { FIXME("no interface for %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -164,6 +168,67 @@ static const BaseFilterFuncTable filter_func_table = { AVICompressor_GetPinCount }; +static AVICompressor *impl_from_IPersistPropertyBag(IPersistPropertyBag *iface) +{ + return CONTAINING_RECORD(iface, AVICompressor, IPersistPropertyBag_iface); +} + +static HRESULT WINAPI AVICompressorPropertyBag_QueryInterface(IPersistPropertyBag *iface, REFIID riid, void **ppv) +{ + AVICompressor *This = impl_from_IPersistPropertyBag(iface); + return IBaseFilter_QueryInterface(&This->filter.IBaseFilter_iface, riid, ppv); +} + +static ULONG WINAPI AVICompressorPropertyBag_AddRef(IPersistPropertyBag *iface) +{ + AVICompressor *This = impl_from_IPersistPropertyBag(iface); + return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); +} + +static ULONG WINAPI AVICompressorPropertyBag_Release(IPersistPropertyBag *iface) +{ + AVICompressor *This = impl_from_IPersistPropertyBag(iface); + return IBaseFilter_Release(&This->filter.IBaseFilter_iface); +} + +static HRESULT WINAPI AVICompressorPropertyBag_GetClassID(IPersistPropertyBag *iface, CLSID *pClassID) +{ + AVICompressor *This = impl_from_IPersistPropertyBag(iface); + return IBaseFilter_GetClassID(&This->filter.IBaseFilter_iface, pClassID); +} + +static HRESULT WINAPI AVICompressorPropertyBag_InitNew(IPersistPropertyBag *iface) +{ + AVICompressor *This = impl_from_IPersistPropertyBag(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI AVICompressorPropertyBag_Load(IPersistPropertyBag *iface, IPropertyBag *pPropBag, IErrorLog *pErrorLog) +{ + AVICompressor *This = impl_from_IPersistPropertyBag(iface); + FIXME("(%p)->(%p %p)\n", This, pPropBag, pErrorLog); + return E_NOTIMPL; +} + +static HRESULT WINAPI AVICompressorPropertyBag_Save(IPersistPropertyBag *iface, IPropertyBag *pPropBag, + BOOL fClearDirty, BOOL fSaveAllProperties) +{ + AVICompressor *This = impl_from_IPersistPropertyBag(iface); + FIXME("(%p)->(%p %x %x)\n", This, pPropBag, fClearDirty, fSaveAllProperties); + return E_NOTIMPL; +} + +static const IPersistPropertyBagVtbl PersistPropertyBagVtbl = { + AVICompressorPropertyBag_QueryInterface, + AVICompressorPropertyBag_AddRef, + AVICompressorPropertyBag_Release, + AVICompressorPropertyBag_GetClassID, + AVICompressorPropertyBag_InitNew, + AVICompressorPropertyBag_Load, + AVICompressorPropertyBag_Save +}; + IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) { AVICompressor *compressor; @@ -179,6 +244,8 @@ IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) BaseFilter_Init(&compressor->filter, &AVICompressorVtbl, &CLSID_AVICo, (DWORD_PTR)(__FILE__ ": AVICompressor.csFilter"), &filter_func_table); + compressor->IPersistPropertyBag_iface.lpVtbl = &PersistPropertyBagVtbl; + *phr = S_OK; return (IUnknown*)&compressor->filter.IBaseFilter_iface; } diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 014a763..8081bce 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1335,7 +1335,9 @@ static void test_AviMux(void) static void test_AviCo(void) { + IPersistPropertyBag *persist_bag; IBaseFilter *avico; + IPin *pin; HRESULT hres; hres = CoCreateInstance(&CLSID_AVICo, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void**)&avico); @@ -1345,6 +1347,13 @@ static void test_AviCo(void) } ok(hres == S_OK, "Could not create CLSID_AVICo class: %08x\n", hres); + hres = IBaseFilter_QueryInterface(avico, &IID_IPin, (void**)&pin); + ok(hres == E_NOINTERFACE, "QueryInterface(IID_IPin) returned: %08x\n", hres); + + hres = IBaseFilter_QueryInterface(avico, &IID_IPersistPropertyBag, (void**)&persist_bag); + ok(hres == S_OK, "QueryInterface(IID_IPersistPropertyBag) returned: %08x\n", hres); + + IPersistPropertyBag_Release(persist_bag); IBaseFilter_Release(avico); }

1 0