February 2014 - Wine-Commits

Jacek Caban : urlmon/tests: Use test.winehq.org for https protocol tests.
by Alexandre Julliard Feb. 6, 2014

Feb. 6, 2014

Module: wine Branch: master Commit: 8f289c821e985a332be5616cac3d381f5007f120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f289c821e985a332be5616ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 6 15:56:25 2014 +0100 urlmon/tests: Use test.winehq.org for https protocol tests. --- dlls/urlmon/tests/protocol.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 3358506..a8f8d7a 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -574,6 +574,8 @@ static void call_continue(PROTOCOLDATA *protocol_data) { HRESULT hres; + trace("continue in state %d\n", state); + if(state == STATE_CONNECTING) { if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST || tested_protocol == FTP_TEST) { if (http_is_first){ @@ -3192,13 +3194,13 @@ static void test_http_protocol(void) static void test_https_protocol(void) { - static const WCHAR codeweavers_url[] = - {'h','t','t','p','s',':','/','/','w','w','w','.','c','o','d','e','w','e','a','v','e','r','s', - '.','c','o','m','/','t','e','s','t','.','h','t','m','l',0}; + static const WCHAR https_winehq_url[] = + {'h','t','t','p','s',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/', + 't','e','s','t','s','/','h','e','l','l','o','.','h','t','m','l',0}; trace("Testing https protocol (from urlmon)...\n"); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; - test_http_protocol_url(codeweavers_url, HTTPS_TEST, TEST_FIRST_HTTP, TYMED_NULL); + test_http_protocol_url(https_winehq_url, HTTPS_TEST, TEST_FIRST_HTTP, TYMED_NULL); }

1 0

Dmitry Timoshkov : server: Add PROCESS_QUERY_LIMITED_INFORMATION to GENERIC_EXECUTE access mapping and appropriately change PROCESS_ALL_ACCESS.
by Alexandre Julliard Feb. 6, 2014

Feb. 6, 2014

Module: wine Branch: master Commit: a0b08adbe40aaaaed0868af00f094123f7ab8b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0b08adbe40aaaaed0868af00… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 6 20:48:13 2014 +0900 server: Add PROCESS_QUERY_LIMITED_INFORMATION to GENERIC_EXECUTE access mapping and appropriately change PROCESS_ALL_ACCESS. --- dlls/advapi32/tests/security.c | 1 - include/winnt.h | 2 +- server/process.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 6225529..f3cc85d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5061,7 +5061,6 @@ static void test_process_access(void) "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_EXECUTE: -todo_wine ok(access == map[i].mapped || access == (map[i].mapped | PROCESS_QUERY_LIMITED_INFORMATION | PROCESS_TERMINATE) /* Vista+ */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; diff --git a/include/winnt.h b/include/winnt.h index dd4ef63..ded7600 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4542,7 +4542,7 @@ typedef enum tagSID_NAME_USE { #define PROCESS_QUERY_INFORMATION 0x0400 #define PROCESS_SUSPEND_RESUME 0x0800 #define PROCESS_QUERY_LIMITED_INFORMATION 0x1000 -#define PROCESS_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0xfff) +#define PROCESS_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0xffff) #define THREAD_TERMINATE 0x0001 #define THREAD_SUSPEND_RESUME 0x0002 diff --git a/server/process.c b/server/process.c index 41b5eca..ceaef64 100644 --- a/server/process.c +++ b/server/process.c @@ -451,7 +451,7 @@ static unsigned int process_map_access( struct object *obj, unsigned int access if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | PROCESS_QUERY_INFORMATION | PROCESS_VM_READ; if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | PROCESS_SET_QUOTA | PROCESS_SET_INFORMATION | PROCESS_SUSPEND_RESUME | 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_TERMINATE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | PROCESS_QUERY_LIMITED_INFORMATION | PROCESS_TERMINATE; if (access & GENERIC_ALL) access |= PROCESS_ALL_ACCESS; return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); }

1 0

Dmitry Timoshkov : server: Fix generic access mapping for a process.
by Alexandre Julliard Feb. 6, 2014

Feb. 6, 2014

Module: wine Branch: master Commit: 53847fd6a1b78e16a9591992bad051c9b6431bf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53847fd6a1b78e16a9591992b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 6 20:47:29 2014 +0900 server: Fix generic access mapping for a process. --- dlls/advapi32/tests/security.c | 2 -- server/process.c | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 87f3ea93..6225529 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5053,12 +5053,10 @@ static void test_process_access(void) switch (map[i].generic) { case GENERIC_READ: -todo_wine ok(access == map[i].mapped || access == (map[i].mapped | PROCESS_QUERY_LIMITED_INFORMATION) /* Vista+ */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_WRITE: -todo_wine ok(access == map[i].mapped || access == (map[i].mapped | PROCESS_TERMINATE) /* before Vista */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; diff --git a/server/process.c b/server/process.c index 4a73662..41b5eca 100644 --- a/server/process.c +++ b/server/process.c @@ -448,9 +448,10 @@ static int process_signaled( struct object *obj, struct wait_queue_entry *entry static unsigned int process_map_access( struct object *obj, unsigned int access ) { - if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE; - if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | SYNCHRONIZE; - if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | PROCESS_QUERY_INFORMATION | PROCESS_VM_READ; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | PROCESS_SET_QUOTA | PROCESS_SET_INFORMATION | PROCESS_SUSPEND_RESUME | + 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_TERMINATE; if (access & GENERIC_ALL) access |= PROCESS_ALL_ACCESS; return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); }

1 0

Dmitry Timoshkov : taskschd: Add a NULL check to ITaskFolder::GetFolders.
by Alexandre Julliard Feb. 6, 2014

Feb. 6, 2014

Module: wine Branch: master Commit: 9c7025f92fb7bc0ac0235a1e5b7aeaabe38c6cd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c7025f92fb7bc0ac0235a1e5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 5 15:08:32 2014 +0900 taskschd: Add a NULL check to ITaskFolder::GetFolders. --- dlls/taskschd/folder.c | 2 ++ dlls/taskschd/tests/scheduler.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 8d8a1a3..0618c23 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -236,6 +236,8 @@ static HRESULT WINAPI TaskFolder_GetFolders(ITaskFolder *iface, LONG flags, ITas TRACE("%p,%x,%p: stub\n", iface, flags, folders); + if (!folders) return E_POINTER; + if (flags) FIXME("unsupported flags %x\n", flags); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index be36069..df00eb2 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -453,6 +453,9 @@ static void test_FolderCollection(void) hr = ITaskFolder_GetFolder(root, Wine, &folder); ok(hr == S_OK, "GetFolder error %#x\n", hr); + hr = ITaskFolder_GetFolders(folder, 0, NULL); + ok (hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + hr = ITaskFolder_GetFolders(folder, 0, &folders); ok(hr == S_OK, "GetFolders error %#x\n", hr);

1 0

Martin Storsjo : api-ms-win-service-core-l1-1-1: Add stub dll.
by Alexandre Julliard Feb. 6, 2014

Feb. 6, 2014

Module: wine Branch: master Commit: 0f14b7de01c41b6549d7414343defe35472f21a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f14b7de01c41b6549d741434… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Feb 4 15:55:48 2014 +0200 api-ms-win-service-core-l1-1-1: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-service-core-l1-1-1/Makefile.in | 1 + .../api-ms-win-service-core-l1-1-1.spec | 6 ++++++ tools/make_specfiles | 1 + 5 files changed, 11 insertions(+) diff --git a/configure b/configure index 16d1fea..7c8d39b 100755 --- a/configure +++ b/configure @@ -899,6 +899,7 @@ enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_security_base_l1_1_0 enable_api_ms_win_security_base_l1_2_0 enable_api_ms_win_security_sddl_l1_1_0 +enable_api_ms_win_service_core_l1_1_1 enable_apphelp enable_appwiz_cpl enable_atl @@ -16651,6 +16652,7 @@ wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_d wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_base_l1_2_0 wine_fn_config_dll api-ms-win-security-sddl-l1-1-0 enable_api_ms_win_security_sddl_l1_1_0 +wine_fn_config_dll api-ms-win-service-core-l1-1-1 enable_api_ms_win_service_core_l1_1_1 wine_fn_config_dll apphelp enable_apphelp wine_fn_config_test dlls/apphelp/tests apphelp_test wine_fn_config_dll appwiz.cpl enable_appwiz_cpl po diff --git a/configure.ac b/configure.ac index 15ca4a0..a59006f 100644 --- a/configure.ac +++ b/configure.ac @@ -2668,6 +2668,7 @@ WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0) WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1) WINE_CONFIG_DLL(apphelp) WINE_CONFIG_TEST(dlls/apphelp/tests) WINE_CONFIG_DLL(appwiz.cpl,,[po]) diff --git a/dlls/api-ms-win-service-core-l1-1-1/Makefile.in b/dlls/api-ms-win-service-core-l1-1-1/Makefile.in new file mode 100644 index 0000000..233dd7e --- /dev/null +++ b/dlls/api-ms-win-service-core-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-service-core-l1-1-1.dll diff --git a/dlls/api-ms-win-service-core-l1-1-1/api-ms-win-service-core-l1-1-1.spec b/dlls/api-ms-win-service-core-l1-1-1/api-ms-win-service-core-l1-1-1.spec new file mode 100644 index 0000000..b47d284 --- /dev/null +++ b/dlls/api-ms-win-service-core-l1-1-1/api-ms-win-service-core-l1-1-1.spec @@ -0,0 +1,6 @@ +@ stdcall EnumDependentServicesW(long long ptr long ptr ptr) advapi32.EnumDependentServicesW +@ stdcall EnumServicesStatusExW(long long long long ptr long ptr ptr ptr wstr) advapi32.EnumServicesStatusExW +@ stub QueryServiceDynamicInformation +@ stdcall RegisterServiceCtrlHandlerExW(wstr ptr ptr) advapi32.RegisterServiceCtrlHandlerExW +@ stdcall SetServiceStatus(long long) advapi32.SetServiceStatus +@ stdcall StartServiceCtrlDispatcherW(ptr) advapi32.StartServiceCtrlDispatcherW diff --git a/tools/make_specfiles b/tools/make_specfiles index b2081c2..2cb78a6 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -134,6 +134,7 @@ my @dll_groups = "api-ms-win-eventing-provider-l1-1-0", "api-ms-win-security-base-l1-2-0", "api-ms-win-security-sddl-l1-1-0", + "api-ms-win-service-core-l1-1-1", ], [ "kernel32",

1 0

Martin Storsjo : api-ms-win-security-sddl-l1-1-0: Add stub dll.
by Alexandre Julliard Feb. 6, 2014

Feb. 6, 2014

Module: wine Branch: master Commit: b38ce68d917b6b08eb531df720a4d6ccb51583b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b38ce68d917b6b08eb531df72… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Feb 4 15:55:47 2014 +0200 api-ms-win-security-sddl-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-security-sddl-l1-1-0/Makefile.in | 1 + .../api-ms-win-security-sddl-l1-1-0.spec | 4 ++++ tools/make_specfiles | 1 + 5 files changed, 9 insertions(+) diff --git a/configure b/configure index 98aa949..16d1fea 100755 --- a/configure +++ b/configure @@ -898,6 +898,7 @@ enable_api_ms_win_eventing_provider_l1_1_0 enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_security_base_l1_1_0 enable_api_ms_win_security_base_l1_2_0 +enable_api_ms_win_security_sddl_l1_1_0 enable_apphelp enable_appwiz_cpl enable_atl @@ -16649,6 +16650,7 @@ wine_fn_config_dll api-ms-win-eventing-provider-l1-1-0 enable_api_ms_win_eventin wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_base_l1_2_0 +wine_fn_config_dll api-ms-win-security-sddl-l1-1-0 enable_api_ms_win_security_sddl_l1_1_0 wine_fn_config_dll apphelp enable_apphelp wine_fn_config_test dlls/apphelp/tests apphelp_test wine_fn_config_dll appwiz.cpl enable_appwiz_cpl po diff --git a/configure.ac b/configure.ac index b7edf78..15ca4a0 100644 --- a/configure.ac +++ b/configure.ac @@ -2667,6 +2667,7 @@ WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0) WINE_CONFIG_DLL(apphelp) WINE_CONFIG_TEST(dlls/apphelp/tests) WINE_CONFIG_DLL(appwiz.cpl,,[po]) diff --git a/dlls/api-ms-win-security-sddl-l1-1-0/Makefile.in b/dlls/api-ms-win-security-sddl-l1-1-0/Makefile.in new file mode 100644 index 0000000..3083620 --- /dev/null +++ b/dlls/api-ms-win-security-sddl-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-sddl-l1-1-0.dll diff --git a/dlls/api-ms-win-security-sddl-l1-1-0/api-ms-win-security-sddl-l1-1-0.spec b/dlls/api-ms-win-security-sddl-l1-1-0/api-ms-win-security-sddl-l1-1-0.spec new file mode 100644 index 0000000..1ac8704 --- /dev/null +++ b/dlls/api-ms-win-security-sddl-l1-1-0/api-ms-win-security-sddl-l1-1-0.spec @@ -0,0 +1,4 @@ +@ stdcall ConvertSecurityDescriptorToStringSecurityDescriptorW(ptr long long ptr ptr) advapi32.ConvertSecurityDescriptorToStringSecurityDescriptorW +@ stdcall ConvertSidToStringSidW(ptr ptr) advapi32.ConvertSidToStringSidW +@ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) advapi32.ConvertStringSecurityDescriptorToSecurityDescriptorW +@ stdcall ConvertStringSidToSidW(ptr ptr) advapi32.ConvertStringSidToSidW diff --git a/tools/make_specfiles b/tools/make_specfiles index 040b422..b2081c2 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -133,6 +133,7 @@ my @dll_groups = "api-ms-win-core-registry-l1-1-0", "api-ms-win-eventing-provider-l1-1-0", "api-ms-win-security-base-l1-2-0", + "api-ms-win-security-sddl-l1-1-0", ], [ "kernel32",

1 0

Martin Storsjo : api-ms-win-security-base-l1-2-0: Add stub dll.
by Alexandre Julliard Feb. 6, 2014

Feb. 6, 2014

Module: wine Branch: master Commit: eb69831cef34e2175e28082f56761ee07773e43c URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb69831cef34e2175e28082f5… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Feb 4 15:55:46 2014 +0200 api-ms-win-security-base-l1-2-0: Add stub dll. --- configure | 2 + configure.ac | 1 + dlls/api-ms-win-security-base-l1-2-0/Makefile.in | 1 + .../api-ms-win-security-base-l1-2-0.spec | 102 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 107 insertions(+) diff --git a/configure b/configure index af0be80..98aa949 100755 --- a/configure +++ b/configure @@ -897,6 +897,7 @@ enable_api_ms_win_downlevel_version_l1_1_0 enable_api_ms_win_eventing_provider_l1_1_0 enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_security_base_l1_1_0 +enable_api_ms_win_security_base_l1_2_0 enable_apphelp enable_appwiz_cpl enable_atl @@ -16647,6 +16648,7 @@ wine_fn_config_dll api-ms-win-downlevel-version-l1-1-0 enable_api_ms_win_downlev wine_fn_config_dll api-ms-win-eventing-provider-l1-1-0 enable_api_ms_win_eventing_provider_l1_1_0 wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 +wine_fn_config_dll api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_base_l1_2_0 wine_fn_config_dll apphelp enable_apphelp wine_fn_config_test dlls/apphelp/tests apphelp_test wine_fn_config_dll appwiz.cpl enable_appwiz_cpl po diff --git a/configure.ac b/configure.ac index 2c33fd1..b7edf78 100644 --- a/configure.ac +++ b/configure.ac @@ -2666,6 +2666,7 @@ WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0) WINE_CONFIG_DLL(apphelp) WINE_CONFIG_TEST(dlls/apphelp/tests) WINE_CONFIG_DLL(appwiz.cpl,,[po]) diff --git a/dlls/api-ms-win-security-base-l1-2-0/Makefile.in b/dlls/api-ms-win-security-base-l1-2-0/Makefile.in new file mode 100644 index 0000000..ea3a611 --- /dev/null +++ b/dlls/api-ms-win-security-base-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-base-l1-2-0.dll diff --git a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec new file mode 100644 index 0000000..d268183 --- /dev/null +++ b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec @@ -0,0 +1,102 @@ +@ stdcall AccessCheck(ptr long long ptr ptr ptr ptr ptr) advapi32.AccessCheck +@ stdcall AccessCheckAndAuditAlarmW(wstr ptr wstr wstr ptr long ptr long ptr ptr ptr) advapi32.AccessCheckAndAuditAlarmW +@ stdcall AccessCheckByType(ptr ptr long long ptr long ptr ptr ptr ptr ptr) advapi32.AccessCheckByType +@ stub AccessCheckByTypeAndAuditAlarmW +@ stub AccessCheckByTypeResultList +@ stub AccessCheckByTypeResultListAndAuditAlarmByHandleW +@ stub AccessCheckByTypeResultListAndAuditAlarmW +@ stdcall AddAccessAllowedAce(ptr long long ptr) advapi32.AddAccessAllowedAce +@ stdcall AddAccessAllowedAceEx(ptr long long long ptr) advapi32.AddAccessAllowedAceEx +@ stub AddAccessAllowedObjectAce +@ stdcall AddAccessDeniedAce(ptr long long ptr) advapi32.AddAccessDeniedAce +@ stdcall AddAccessDeniedAceEx(ptr long long long ptr) advapi32.AddAccessDeniedAceEx +@ stub AddAccessDeniedObjectAce +@ stdcall AddAce(ptr long long ptr long) advapi32.AddAce +@ stdcall AddAuditAccessAce(ptr long long ptr long long) advapi32.AddAuditAccessAce +@ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) advapi32.AddAuditAccessAceEx +@ stub AddAuditAccessObjectAce +@ stdcall AddMandatoryAce(ptr long long long ptr) advapi32.AddMandatoryAce +@ stub AddResourceAttributeAce +@ stub AddScopedPolicyIDAce +@ stdcall AdjustTokenGroups(long long ptr long ptr ptr) advapi32.AdjustTokenGroups +@ stdcall AdjustTokenPrivileges(long long ptr long ptr ptr) advapi32.AdjustTokenPrivileges +@ stdcall AllocateAndInitializeSid(ptr long long long long long long long long long ptr) advapi32.AllocateAndInitializeSid +@ stdcall AllocateLocallyUniqueId(ptr) advapi32.AllocateLocallyUniqueId +@ stdcall AreAllAccessesGranted(long long) advapi32.AreAllAccessesGranted +@ stdcall AreAnyAccessesGranted(long long) advapi32.AreAnyAccessesGranted +@ stub CheckTokenCapability +@ stdcall CheckTokenMembership(long ptr ptr) advapi32.CheckTokenMembership +@ stub CheckTokenMembershipEx +@ stdcall ConvertToAutoInheritPrivateObjectSecurity(ptr ptr ptr ptr long ptr) advapi32.ConvertToAutoInheritPrivateObjectSecurity +@ stdcall CopySid(long ptr ptr) advapi32.CopySid +@ stdcall CreatePrivateObjectSecurity(ptr ptr ptr long long ptr) advapi32.CreatePrivateObjectSecurity +@ stub CreatePrivateObjectSecurityEx +@ stub CreatePrivateObjectSecurityWithMultipleInheritance +@ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) advapi32.CreateRestrictedToken +@ stdcall CreateWellKnownSid(long ptr ptr ptr) advapi32.CreateWellKnownSid +@ stdcall DeleteAce(ptr long) advapi32.DeleteAce +@ stdcall DestroyPrivateObjectSecurity(ptr) advapi32.DestroyPrivateObjectSecurity +@ stdcall DuplicateToken(long long ptr) advapi32.DuplicateToken +@ stdcall DuplicateTokenEx(long long ptr long long ptr) advapi32.DuplicateTokenEx +@ stub EqualDomainSid +@ stdcall EqualPrefixSid(ptr ptr) advapi32.EqualPrefixSid +@ stdcall EqualSid(ptr ptr) advapi32.EqualSid +@ stdcall FindFirstFreeAce(ptr ptr) advapi32.FindFirstFreeAce +@ stdcall FreeSid(ptr) advapi32.FreeSid +@ stdcall GetAce(ptr long ptr) advapi32.GetAce +@ stdcall GetAclInformation(ptr ptr long long) advapi32.GetAclInformation +@ stub GetAppContainerAce +@ stub GetCachedSigningLevel +@ stdcall GetFileSecurityW(wstr long ptr long ptr) advapi32.GetFileSecurityW +@ stdcall GetKernelObjectSecurity(long long ptr long ptr) advapi32.GetKernelObjectSecurity +@ stdcall GetLengthSid(ptr) advapi32.GetLengthSid +@ stdcall GetPrivateObjectSecurity(ptr long ptr long ptr) advapi32.GetPrivateObjectSecurity +@ stdcall GetSecurityDescriptorControl(ptr ptr ptr) advapi32.GetSecurityDescriptorControl +@ stdcall GetSecurityDescriptorDacl(ptr ptr ptr ptr) advapi32.GetSecurityDescriptorDacl +@ stdcall GetSecurityDescriptorGroup(ptr ptr ptr) advapi32.GetSecurityDescriptorGroup +@ stdcall GetSecurityDescriptorLength(ptr) advapi32.GetSecurityDescriptorLength +@ stdcall GetSecurityDescriptorOwner(ptr ptr ptr) advapi32.GetSecurityDescriptorOwner +@ stub GetSecurityDescriptorRMControl +@ stdcall GetSecurityDescriptorSacl(ptr ptr ptr ptr) advapi32.GetSecurityDescriptorSacl +@ stdcall GetSidIdentifierAuthority(ptr) advapi32.GetSidIdentifierAuthority +@ stdcall GetSidLengthRequired(long) advapi32.GetSidLengthRequired +@ stdcall GetSidSubAuthority(ptr long) advapi32.GetSidSubAuthority +@ stdcall GetSidSubAuthorityCount(ptr) advapi32.GetSidSubAuthorityCount +@ stdcall GetTokenInformation(long long ptr long ptr) advapi32.GetTokenInformation +@ stub GetWindowsAccountDomainSid +@ stub ImpersonateAnonymousToken +@ stdcall ImpersonateLoggedOnUser(long) advapi32.ImpersonateLoggedOnUser +@ stdcall ImpersonateSelf(long) advapi32.ImpersonateSelf +@ stdcall InitializeAcl(ptr long long) advapi32.InitializeAcl +@ stdcall InitializeSecurityDescriptor(ptr long) advapi32.InitializeSecurityDescriptor +@ stdcall InitializeSid(ptr ptr long) advapi32.InitializeSid +@ stdcall IsTokenRestricted(long) advapi32.IsTokenRestricted +@ stdcall IsValidAcl(ptr) advapi32.IsValidAcl +@ stdcall IsValidSecurityDescriptor(ptr) advapi32.IsValidSecurityDescriptor +@ stdcall IsValidSid(ptr) advapi32.IsValidSid +@ stdcall IsWellKnownSid(ptr long) advapi32.IsWellKnownSid +@ stdcall MakeAbsoluteSD(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) advapi32.MakeAbsoluteSD +@ stdcall MakeSelfRelativeSD(ptr ptr ptr) advapi32.MakeSelfRelativeSD +@ stdcall MapGenericMask(ptr ptr) advapi32.MapGenericMask +@ stdcall ObjectCloseAuditAlarmW(wstr ptr long) advapi32.ObjectCloseAuditAlarmW +@ stdcall ObjectDeleteAuditAlarmW(wstr ptr long) advapi32.ObjectDeleteAuditAlarmW +@ stdcall ObjectOpenAuditAlarmW(wstr ptr wstr wstr ptr long long long ptr long long ptr) advapi32.ObjectOpenAuditAlarmW +@ stdcall ObjectPrivilegeAuditAlarmW(wstr ptr long long ptr long) advapi32.ObjectPrivilegeAuditAlarmW +@ stdcall PrivilegeCheck(ptr ptr ptr) advapi32.PrivilegeCheck +@ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long) advapi32.PrivilegedServiceAuditAlarmW +@ stub QuerySecurityAccessMask +@ stdcall RevertToSelf() advapi32.RevertToSelf +@ stdcall SetAclInformation(ptr ptr long long) advapi32.SetAclInformation +@ stub SetCachedSigningLevel +@ stdcall SetFileSecurityW(wstr long ptr) advapi32.SetFileSecurityW +@ stdcall SetKernelObjectSecurity(long long ptr) advapi32.SetKernelObjectSecurity +@ stdcall SetPrivateObjectSecurity(long ptr ptr ptr long) advapi32.SetPrivateObjectSecurity +@ stub SetPrivateObjectSecurityEx +@ stub SetSecurityAccessMask +@ stdcall SetSecurityDescriptorControl(ptr long long) advapi32.SetSecurityDescriptorControl +@ stdcall SetSecurityDescriptorDacl(ptr long ptr long) advapi32.SetSecurityDescriptorDacl +@ stdcall SetSecurityDescriptorGroup(ptr ptr long) advapi32.SetSecurityDescriptorGroup +@ stdcall SetSecurityDescriptorOwner(ptr ptr long) advapi32.SetSecurityDescriptorOwner +@ stub SetSecurityDescriptorRMControl +@ stdcall SetSecurityDescriptorSacl(ptr long ptr long) advapi32.SetSecurityDescriptorSacl +@ stdcall SetTokenInformation(long long ptr long) advapi32.SetTokenInformation diff --git a/tools/make_specfiles b/tools/make_specfiles index 00fe4f7..040b422 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -132,6 +132,7 @@ my @dll_groups = "api-ms-win-security-base-l1-1-0", "api-ms-win-core-registry-l1-1-0", "api-ms-win-eventing-provider-l1-1-0", + "api-ms-win-security-base-l1-2-0", ], [ "kernel32",

1 0

Jacek Caban : wmp: Added IPersistStreamInit stub implementation.
by Alexandre Julliard Feb. 6, 2014

Feb. 6, 2014

Module: wine Branch: master Commit: 28a1eaedc9626e35f5b23188534e75afcdd0bc35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28a1eaedc9626e35f5b231885… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 6 11:38:09 2014 +0100 wmp: Added IPersistStreamInit stub implementation. --- dlls/wmp/oleobj.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/tests/oleobj.c | 17 +++++++++ 2 files changed, 106 insertions(+) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 79a21ca..380ae1f 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -25,6 +25,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmp); struct WindowsMediaPlayer { IOleObject IOleObject_iface; IProvideClassInfo2 IProvideClassInfo2_iface; + IPersistStreamInit IPersistStreamInit_iface; + LONG ref; }; @@ -49,6 +51,12 @@ static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, v }else if(IsEqualGUID(riid, &IID_IProvideClassInfo2)) { TRACE("(%p)->(IID_IProvideClassInfo2 %p)\n", This, ppv); *ppv = &This->IProvideClassInfo2_iface; + }else if(IsEqualGUID(riid, &IID_IPersist)) { + TRACE("(%p)->(IID_IPersist %p)\n", This, ppv); + *ppv = &This->IPersistStreamInit_iface; + }else if(IsEqualGUID(riid, &IID_IPersistStreamInit)) { + TRACE("(%p)->(IID_IPersistStreamInit %p)\n", This, ppv); + *ppv = &This->IPersistStreamInit_iface; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -311,6 +319,86 @@ static const IProvideClassInfo2Vtbl ProvideClassInfo2Vtbl = { ProvideClassInfo2_GetGUID }; +static inline WindowsMediaPlayer *impl_from_IPersistStreamInit(IPersistStreamInit *iface) +{ + return CONTAINING_RECORD(iface, WindowsMediaPlayer, IPersistStreamInit_iface); +} + +static HRESULT WINAPI PersistStreamInit_QueryInterface(IPersistStreamInit *iface, + REFIID riid, void **ppv) +{ + WindowsMediaPlayer *This = impl_from_IPersistStreamInit(iface); + return IOleObject_QueryInterface(&This->IOleObject_iface, riid, ppv); +} + +static ULONG WINAPI PersistStreamInit_AddRef(IPersistStreamInit *iface) +{ + WindowsMediaPlayer *This = impl_from_IPersistStreamInit(iface); + return IOleObject_AddRef(&This->IOleObject_iface); +} + +static ULONG WINAPI PersistStreamInit_Release(IPersistStreamInit *iface) +{ + WindowsMediaPlayer *This = impl_from_IPersistStreamInit(iface); + return IOleObject_Release(&This->IOleObject_iface); +} + +static HRESULT WINAPI PersistStreamInit_GetClassID(IPersistStreamInit *iface, CLSID *pClassID) +{ + WindowsMediaPlayer *This = impl_from_IPersistStreamInit(iface); + FIXME("(%p)->(%p)\n", This, pClassID); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_IsDirty(IPersistStreamInit *iface) +{ + WindowsMediaPlayer *This = impl_from_IPersistStreamInit(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM pStm) +{ + WindowsMediaPlayer *This = impl_from_IPersistStreamInit(iface); + FIXME("(%p)->(%p)\n", This, pStm); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, LPSTREAM pStm, + BOOL fClearDirty) +{ + WindowsMediaPlayer *This = impl_from_IPersistStreamInit(iface); + FIXME("(%p)->(%p %x)\n", This, pStm, fClearDirty); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_GetSizeMax(IPersistStreamInit *iface, + ULARGE_INTEGER *pcbSize) +{ + WindowsMediaPlayer *This = impl_from_IPersistStreamInit(iface); + FIXME("(%p)->(%p)\n", This, pcbSize); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) +{ + WindowsMediaPlayer *This = impl_from_IPersistStreamInit(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static const IPersistStreamInitVtbl PersistStreamInitVtbl = { + PersistStreamInit_QueryInterface, + PersistStreamInit_AddRef, + PersistStreamInit_Release, + PersistStreamInit_GetClassID, + PersistStreamInit_IsDirty, + PersistStreamInit_Load, + PersistStreamInit_Save, + PersistStreamInit_GetSizeMax, + PersistStreamInit_InitNew +}; + HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { @@ -325,6 +413,7 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, wmp->IOleObject_iface.lpVtbl = &OleObjectVtbl; wmp->IProvideClassInfo2_iface.lpVtbl = &ProvideClassInfo2Vtbl; + wmp->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; wmp->ref = 1; diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 45dea43..3f105f4 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -24,9 +24,19 @@ #include "wine/test.h" +static void test_QI(IUnknown *unk) +{ + IUnknown *tmp; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IQuickActivate, (void**)&tmp); + ok(hres == E_NOINTERFACE, "Got IQuickActivate iface when no expected\n"); +} + static void test_wmp(void) { IProvideClassInfo2 *class_info; + IPersistStreamInit *psi; IOleObject *oleobj; GUID guid; LONG ref; @@ -48,6 +58,13 @@ static void test_wmp(void) IProvideClassInfo2_Release(class_info); + test_QI((IUnknown*)oleobj); + + hres = IOleObject_QueryInterface(oleobj, &IID_IPersistStreamInit, (void**)&psi); + ok(hres == S_OK, "Could not get IPersistStreamInit iface: %08x\n", hres); + + IPersistStreamInit_Release(psi); + ref = IOleObject_Release(oleobj); ok(!ref, "ref = %d\n", ref); }

1 0

Dmitry Timoshkov : taskschd: Add ITaskDefinition stub implementation.
by Alexandre Julliard Feb. 6, 2014

Feb. 6, 2014

Module: wine Branch: master Commit: 4248b1405df5bb9fb828440757d5483aa4e3f990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4248b1405df5bb9fb82844075… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 5 15:10:54 2014 +0900 taskschd: Add ITaskDefinition stub implementation. --- dlls/taskschd/task.c | 218 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 216 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 97bb5f8..b465266 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -34,6 +34,209 @@ WINE_DEFAULT_DEBUG_CHANNEL(taskschd); typedef struct { + ITaskDefinition ITaskDefinition_iface; + LONG ref; +} TaskDefinition; + +static inline TaskDefinition *impl_from_ITaskDefinition(ITaskDefinition *iface) +{ + return CONTAINING_RECORD(iface, TaskDefinition, ITaskDefinition_iface); +} + +static ULONG WINAPI TaskDefinition_AddRef(ITaskDefinition *iface) +{ + TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + return InterlockedIncrement(&taskdef->ref); +} + +static ULONG WINAPI TaskDefinition_Release(ITaskDefinition *iface) +{ + TaskDefinition *taskdef = impl_from_ITaskDefinition(iface); + LONG ref = InterlockedDecrement(&taskdef->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + heap_free(taskdef); + } + + return ref; +} + +static HRESULT WINAPI TaskDefinition_QueryInterface(ITaskDefinition *iface, REFIID riid, void **obj) +{ + if (!riid || !obj) return E_INVALIDARG; + + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_ITaskDefinition) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + ITaskDefinition_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static HRESULT WINAPI TaskDefinition_GetTypeInfoCount(ITaskDefinition *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_GetTypeInfo(ITaskDefinition *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_GetIDsOfNames(ITaskDefinition *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_Invoke(ITaskDefinition *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_get_RegistrationInfo(ITaskDefinition *iface, IRegistrationInfo **info) +{ + FIXME("%p,%p: stub\n", iface, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_put_RegistrationInfo(ITaskDefinition *iface, IRegistrationInfo *info) +{ + FIXME("%p,%p: stub\n", iface, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_get_Triggers(ITaskDefinition *iface, ITriggerCollection **triggers) +{ + FIXME("%p,%p: stub\n", iface, triggers); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_put_Triggers(ITaskDefinition *iface, ITriggerCollection *triggers) +{ + FIXME("%p,%p: stub\n", iface, triggers); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_get_Settings(ITaskDefinition *iface, ITaskSettings **settings) +{ + FIXME("%p,%p: stub\n", iface, settings); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_put_Settings(ITaskDefinition *iface, ITaskSettings *settings) +{ + FIXME("%p,%p: stub\n", iface, settings); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_get_Data(ITaskDefinition *iface, BSTR *data) +{ + FIXME("%p,%p: stub\n", iface, data); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_put_Data(ITaskDefinition *iface, BSTR data) +{ + FIXME("%p,%p: stub\n", iface, data); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_get_Principal(ITaskDefinition *iface, IPrincipal **principal) +{ + FIXME("%p,%p: stub\n", iface, principal); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_put_Principal(ITaskDefinition *iface, IPrincipal *principal) +{ + FIXME("%p,%p: stub\n", iface, principal); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_get_Actions(ITaskDefinition *iface, IActionCollection **actions) +{ + FIXME("%p,%p: stub\n", iface, actions); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_put_Actions(ITaskDefinition *iface, IActionCollection *actions) +{ + FIXME("%p,%p: stub\n", iface, actions); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_get_XmlText(ITaskDefinition *iface, BSTR *xml) +{ + FIXME("%p,%p: stub\n", iface, xml); + return E_NOTIMPL; +} + +static HRESULT WINAPI TaskDefinition_put_XmlText(ITaskDefinition *iface, BSTR xml) +{ + FIXME("%p,%p: stub\n", iface, xml); + return E_NOTIMPL; +} + +static const ITaskDefinitionVtbl TaskDefinition_vtbl = +{ + TaskDefinition_QueryInterface, + TaskDefinition_AddRef, + TaskDefinition_Release, + TaskDefinition_GetTypeInfoCount, + TaskDefinition_GetTypeInfo, + TaskDefinition_GetIDsOfNames, + TaskDefinition_Invoke, + TaskDefinition_get_RegistrationInfo, + TaskDefinition_put_RegistrationInfo, + TaskDefinition_get_Triggers, + TaskDefinition_put_Triggers, + TaskDefinition_get_Settings, + TaskDefinition_put_Settings, + TaskDefinition_get_Data, + TaskDefinition_put_Data, + TaskDefinition_get_Principal, + TaskDefinition_put_Principal, + TaskDefinition_get_Actions, + TaskDefinition_put_Actions, + TaskDefinition_get_XmlText, + TaskDefinition_put_XmlText +}; + +static HRESULT TaskDefinition_create(ITaskDefinition **obj) +{ + TaskDefinition *taskdef; + + taskdef = heap_alloc(sizeof(*taskdef)); + if (!taskdef) return E_OUTOFMEMORY; + + taskdef->ITaskDefinition_iface.lpVtbl = &TaskDefinition_vtbl; + taskdef->ref = 1; + *obj = &taskdef->ITaskDefinition_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} + +typedef struct +{ ITaskService ITaskService_iface; LONG ref; BOOL connected; @@ -134,8 +337,19 @@ static HRESULT WINAPI TaskService_GetRunningTasks(ITaskService *iface, LONG flag static HRESULT WINAPI TaskService_NewTask(ITaskService *iface, DWORD flags, ITaskDefinition **definition) { - FIXME("%p,%x,%p: stub\n", iface, flags, definition); - return E_NOTIMPL; + TaskService *task_svc = impl_from_ITaskService(iface); + + TRACE("%p,%x,%p\n", iface, flags, definition); + + if (!definition) return E_POINTER; + + if (!task_svc->connected) + return HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED); + + if (flags) + FIXME("unsupported flags %x\n", flags); + + return TaskDefinition_create(definition); } static inline BOOL is_variant_null(const VARIANT *var)

1 0

Dmitry Timoshkov : taskschd: Add IRegisteredTaskCollection stub implementation.
by Alexandre Julliard Feb. 6, 2014

Feb. 6, 2014

Module: wine Branch: master Commit: 2201d7b0c1659b28b8a6b89e581e0df5def55132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2201d7b0c1659b28b8a6b89e5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 5 15:10:00 2014 +0900 taskschd: Add IRegisteredTaskCollection stub implementation. --- dlls/taskschd/folder.c | 9 ++- dlls/taskschd/regtask.c | 129 ++++++++++++++++++++++++++++++++++++++ dlls/taskschd/taskschd_private.h | 1 + 3 files changed, 137 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index fd516d6..c5f8010 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -298,8 +298,13 @@ static HRESULT WINAPI TaskFolder_GetTask(ITaskFolder *iface, BSTR path, IRegiste static HRESULT WINAPI TaskFolder_GetTasks(ITaskFolder *iface, LONG flags, IRegisteredTaskCollection **tasks) { - FIXME("%p,%x,%p: stub\n", iface, flags, tasks); - return E_NOTIMPL; + TaskFolder *folder = impl_from_ITaskFolder(iface); + + TRACE("%p,%x,%p: stub\n", iface, flags, tasks); + + if (!tasks) return E_POINTER; + + return RegisteredTaskCollection_create(folder->path, tasks); } static HRESULT WINAPI TaskFolder_DeleteTask(ITaskFolder *iface, BSTR name, LONG flags) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index c0a35a3..5252670 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -267,3 +267,132 @@ HRESULT RegisteredTask_create(const WCHAR *path, IRegisteredTask **obj) return S_OK; } + +typedef struct +{ + IRegisteredTaskCollection IRegisteredTaskCollection_iface; + LONG ref; + WCHAR *path; +} RegisteredTaskCollection; + +static inline RegisteredTaskCollection *impl_from_IRegisteredTaskCollection(IRegisteredTaskCollection *iface) +{ + return CONTAINING_RECORD(iface, RegisteredTaskCollection, IRegisteredTaskCollection_iface); +} + +static ULONG WINAPI regtasks_AddRef(IRegisteredTaskCollection *iface) +{ + RegisteredTaskCollection *regtasks = impl_from_IRegisteredTaskCollection(iface); + return InterlockedIncrement(&regtasks->ref); +} + +static ULONG WINAPI regtasks_Release(IRegisteredTaskCollection *iface) +{ + RegisteredTaskCollection *regtasks = impl_from_IRegisteredTaskCollection(iface); + LONG ref = InterlockedDecrement(&regtasks->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + heap_free(regtasks->path); + heap_free(regtasks); + } + + return ref; +} + +static HRESULT WINAPI regtasks_QueryInterface(IRegisteredTaskCollection *iface, REFIID riid, void **obj) +{ + if (!riid || !obj) return E_INVALIDARG; + + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IRegisteredTaskCollection) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IRegisteredTaskCollection_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static HRESULT WINAPI regtasks_GetTypeInfoCount(IRegisteredTaskCollection *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtasks_GetTypeInfo(IRegisteredTaskCollection *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtasks_GetIDsOfNames(IRegisteredTaskCollection *iface, REFIID riid, LPOLESTR *names, + UINT count, LCID lcid, DISPID *dispid) +{ + FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtasks_Invoke(IRegisteredTaskCollection *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) +{ + FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + params, result, excepinfo, argerr); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtasks_get_Count(IRegisteredTaskCollection *iface, LONG *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtasks_get_Item(IRegisteredTaskCollection *iface, VARIANT index, IRegisteredTask **regtask) +{ + FIXME("%p,%s,%p: stub\n", iface, debugstr_variant(&index), regtask); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtasks_get__NewEnum(IRegisteredTaskCollection *iface, IUnknown **penum) +{ + FIXME("%p,%p: stub\n", iface, penum); + return E_NOTIMPL; +} + +static const IRegisteredTaskCollectionVtbl RegisteredTaskCollection_vtbl = +{ + regtasks_QueryInterface, + regtasks_AddRef, + regtasks_Release, + regtasks_GetTypeInfoCount, + regtasks_GetTypeInfo, + regtasks_GetIDsOfNames, + regtasks_Invoke, + regtasks_get_Count, + regtasks_get_Item, + regtasks_get__NewEnum +}; + +HRESULT RegisteredTaskCollection_create(const WCHAR *path, IRegisteredTaskCollection **obj) +{ + RegisteredTaskCollection *regtasks; + + regtasks = heap_alloc(sizeof(*regtasks)); + if (!regtasks) return E_OUTOFMEMORY; + + regtasks->IRegisteredTaskCollection_iface.lpVtbl = &RegisteredTaskCollection_vtbl; + regtasks->ref = 1; + regtasks->path = heap_strdupW(path); + *obj = &regtasks->IRegisteredTaskCollection_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} diff --git a/dlls/taskschd/taskschd_private.h b/dlls/taskschd/taskschd_private.h index b1f5ff9..df15903 100644 --- a/dlls/taskschd/taskschd_private.h +++ b/dlls/taskschd/taskschd_private.h @@ -22,6 +22,7 @@ HRESULT TaskService_create(void **obj) DECLSPEC_HIDDEN; HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj, BOOL create) DECLSPEC_HIDDEN; HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **obj) DECLSPEC_HIDDEN; HRESULT RegisteredTask_create(const WCHAR *path, IRegisteredTask **obj) DECLSPEC_HIDDEN; +HRESULT RegisteredTaskCollection_create(const WCHAR *path, IRegisteredTaskCollection **obj) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT *v) DECLSPEC_HIDDEN;

1 0