February 2014 - Wine-commits

Frédéric Delanoy : kernel32/tests: Remove unused variable.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: cb167e8e18ed5483d595699c65e25f9a5933bb46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb167e8e18ed5483d595699c6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 4 11:05:43 2014 +0100 kernel32/tests: Remove unused variable. --- dlls/kernel32/tests/loader.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 2f54968..67d838a 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -42,7 +42,6 @@ struct PROCESS_BASIC_INFORMATION_PRIVATE ULONG_PTR InheritedFromUniqueProcessId; }; -static BOOL is_child; static LONG *child_failures; static WORD cb_count; static DWORD page_size; @@ -2649,7 +2648,6 @@ START_TEST(loader) child_failures = MapViewOfFile(mapping, FILE_MAP_READ|FILE_MAP_WRITE, 0, 0, 4096); if (*child_failures == -1) { - is_child = 1; *child_failures = 0; } else

1 0

Michael Stefaniuc : winmm/tests: Avoid spurious test failures on Windows.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: ff7ebba27f8aea62f09cabd8a8bf285baec6a938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff7ebba27f8aea62f09cabd8a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 4 13:30:57 2014 +0100 winmm/tests: Avoid spurious test failures on Windows. --- dlls/winmm/tests/mci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 1ce0260..6a68b41 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -986,14 +986,14 @@ static void test_asyncWAVE(HWND hwnd) /* Check that the 2s sound plays at a normal pace, giving a wide margin to * account for timing granularity and small delays. */ - todo_wine ok(400 <= p2 && p2 <= 600, "%ums is not in the expected 400-600ms range\n", p2); + todo_wine ok(350 <= p2 && p2 <= 600, "%ums is not in the expected 350-600ms range\n", p2); /* Wine's asynchronous thread needs some time to start up. Furthermore, it * uses 3 buffers per second, so that the positions reported will be 333ms, * 667ms etc. at best, which is why it fails the above test. So add a * second test specifically to prevent Wine from getting even worse. * FIXME: To be removed when Wine is fixed and passes the above test. */ - ok(400 <= p2 && p2 <= 1000, "%ums is not even in the expected 400-1000ms range\n", p2); + ok(350 <= p2 && p2 <= 1000, "%ums is not even in the expected 350-1000ms range\n", p2); test_notification(hwnd,"play (nowait)",0); err = mciSendStringA("pause mysound wait", NULL, 0, hwnd);

1 0

Alistair Leslie-Hughes : dpnet: Cleanup IDirectPlay8Client.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: 9b6832942931163472f5e1c6518c9577a945ca1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b6832942931163472f5e1c65… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 17 14:38:34 2014 +1100 dpnet: Cleanup IDirectPlay8Client. --- dlls/dpnet/client.c | 50 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 637dcb8..9668a68 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -61,24 +61,24 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_QueryInterface(IDirectPlay8Client * static ULONG WINAPI IDirectPlay8ClientImpl_AddRef(IDirectPlay8Client *iface) { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - ULONG refCount = InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p) ref=%u\n", This, ref); - return refCount; + return ref; } static ULONG WINAPI IDirectPlay8ClientImpl_Release(IDirectPlay8Client *iface) { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p) ref=%u\n", This, ref); - if (!refCount) { + if (!ref) { HeapFree(GetProcessHeap(), 0, This); } - return refCount; + return ref; } /* IDirectPlay8Client Interface follow: */ @@ -273,17 +273,27 @@ static const IDirectPlay8ClientVtbl DirectPlay8Client_Vtbl = IDirectPlay8ClientImpl_RegisterLobby }; -HRESULT DPNET_CreateDirectPlay8Client(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) { - IDirectPlay8ClientImpl* client; - - TRACE("(%p, %s, %p)\n", punkOuter, debugstr_guid(riid), ppobj); - - client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8ClientImpl)); - if (NULL == client) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - client->IDirectPlay8Client_iface.lpVtbl = &DirectPlay8Client_Vtbl; - client->ref = 0; /* will be inited with QueryInterface */ - return IDirectPlay8ClientImpl_QueryInterface(&client->IDirectPlay8Client_iface, riid, ppobj); +HRESULT DPNET_CreateDirectPlay8Client(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) +{ + IDirectPlay8ClientImpl* client; + HRESULT hr; + + TRACE("(%p, %s, %p)\n", pUnkOuter, debugstr_guid(riid), ppv); + + *ppv = NULL; + + if(pUnkOuter) + return CLASS_E_NOAGGREGATION; + + client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8ClientImpl)); + if (!client) + return E_OUTOFMEMORY; + + client->IDirectPlay8Client_iface.lpVtbl = &DirectPlay8Client_Vtbl; + client->ref = 1; + + hr = IDirectPlay8ClientImpl_QueryInterface(&client->IDirectPlay8Client_iface, riid, ppv); + IDirectPlay8ClientImpl_Release(&client->IDirectPlay8Client_iface); + + return hr; }

1 0

Alistair Leslie-Hughes : dpnet: Store information when Initialize is called.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: 658a5f450bcdb3f564bdc0684a461033602e0f8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=658a5f450bcdb3f564bdc0684… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 20 09:59:41 2014 +1100 dpnet: Store information when Initialize is called. --- dlls/dpnet/peer.c | 16 ++++++++++++++++ dlls/dpnet/tests/peer.c | 3 +++ 2 files changed, 19 insertions(+) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 1b287dd..7b962a4 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -43,6 +43,10 @@ typedef struct IDirectPlay8PeerImpl { IDirectPlay8Peer IDirectPlay8Peer_iface; LONG ref; + + PFNDPNMESSAGEHANDLER msghandler; + DWORD flags; + void *usercontext; } IDirectPlay8PeerImpl; static inline IDirectPlay8PeerImpl *impl_from_IDirectPlay8Peer(IDirectPlay8Peer *iface) @@ -96,8 +100,17 @@ static ULONG WINAPI IDirectPlay8PeerImpl_Release(IDirectPlay8Peer *iface) static HRESULT WINAPI IDirectPlay8PeerImpl_Initialize(IDirectPlay8Peer *iface, void * const pvUserContext, const PFNDPNMESSAGEHANDLER pfn, const DWORD dwFlags) { + IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface); + TRACE("(%p)->(%p,%p,%x): stub\n", iface, pvUserContext, pfn, dwFlags); + if(!pfn) + return DPNERR_INVALIDPARAM; + + This->usercontext = pvUserContext; + This->msghandler = pfn; + This->flags = dwFlags; + return DPN_OK; } @@ -502,6 +515,9 @@ HRESULT DPNET_CreateDirectPlay8Peer(IClassFactory *iface, IUnknown *pUnkOuter, R Client->IDirectPlay8Peer_iface.lpVtbl = &DirectPlay8Peer_Vtbl; Client->ref = 1; + Client->usercontext = NULL; + Client->msghandler = NULL; + Client->flags = 0; ret = IDirectPlay8Peer_QueryInterface(&Client->IDirectPlay8Peer_iface, riid, ppobj); IDirectPlay8Peer_Release(&Client->IDirectPlay8Peer_iface); diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index a9ab01d..8ae0afe 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -51,6 +51,9 @@ static void test_init_dp(void) hr = CoCreateInstance(&CLSID_DirectPlay8Peer, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Peer, (void **)&peer); ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + hr = IDirectPlay8Peer_Initialize(peer, NULL, NULL, 0); + ok(hr == DPNERR_INVALIDPARAM, "got %x\n", hr); + hr = IDirectPlay8Peer_Initialize(peer, NULL, DirectPlayMessageHandler, 0); ok(hr == S_OK, "IDirectPlay8Peer_Initialize failed with %x\n", hr); }

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Server Initialize.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: d34b75a88722d6c75efe20da212210a1227ac210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d34b75a88722d6c75efe20da2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 20 10:27:28 2014 +1100 dpnet: Implement IDirectPlay8Server Initialize. --- dlls/dpnet/server.c | 17 ++++++++++++++++- dlls/dpnet/tests/server.c | 3 +++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c index 09e0809..3e026fc 100644 --- a/dlls/dpnet/server.c +++ b/dlls/dpnet/server.c @@ -39,6 +39,10 @@ typedef struct IDirectPlay8ServerImpl { IDirectPlay8Server IDirectPlay8Server_iface; LONG ref; + + PFNDPNMESSAGEHANDLER msghandler; + DWORD flags; + void *usercontext; } IDirectPlay8ServerImpl; WINE_DEFAULT_DEBUG_CHANNEL(dpnet); @@ -98,7 +102,15 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_Initialize(IDirectPlay8Server *ifac PFNDPNMESSAGEHANDLER pfn, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%p %p %d)\n", This, pvUserContext, pfn, dwFlags); + TRACE("(%p)->(%p %p %d)\n", This, pvUserContext, pfn, dwFlags); + + if(!pfn) + return DPNERR_INVALIDPARAM; + + This->usercontext = pvUserContext; + This->msghandler = pfn; + This->flags = dwFlags; + return DPN_OK; } @@ -391,6 +403,9 @@ HRESULT DPNET_CreateDirectPlay8Server(IClassFactory *iface, IUnknown *pUnkOuter, server->IDirectPlay8Server_iface.lpVtbl = &DirectPlay8ServerVtbl; server->ref = 1; + server->usercontext = NULL; + server->msghandler = NULL; + server->flags = 0; hr = IDirectPlay8Server_QueryInterface(&server->IDirectPlay8Server_iface, riid, ppv); IDirectPlay8Server_Release(&server->IDirectPlay8Server_iface); diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index ab3e360..f3b1da2 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -39,6 +39,9 @@ static void create_server(void) hr = IDirectPlay8Server_Close(server, 0); todo_wine ok(hr == DPNERR_UNINITIALIZED, "got 0x%08x\n", hr); + hr = IDirectPlay8Server_Initialize(server, NULL, NULL, 0); + ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); + hr = IDirectPlay8Server_Initialize(server, NULL, DirectPlayMessageHandler, 0); ok(hr == S_OK, "got 0x%08x\n", hr); if(hr == S_OK)

1 0

Alexandre Julliard : user32: Only wait for the desktop process when necessary.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: b4b817b907bb7ff3e1ab8769914676b1419fe3f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b817b907bb7ff3e1ab87699… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 30 21:49:32 2014 +0100 user32: Only wait for the desktop process when necessary. --- dlls/user32/driver.c | 7 +++++++ dlls/user32/win.c | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 85e4116..672f194 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -57,8 +57,15 @@ static HMODULE load_desktop_driver( HWND hwnd ) WCHAR key[(sizeof(key_pathW) + sizeof(displayW)) / sizeof(WCHAR) + 40]; UINT guid_atom = HandleToULong( GetPropW( hwnd, display_device_guid_propW )); + USER_CheckNotLock(); + strcpy( driver_load_error, "The explorer process failed to start." ); /* default error */ + if (!guid_atom) + { + SendMessageW( hwnd, WM_NULL, 0, 0 ); /* wait for the desktop process to be ready */ + guid_atom = HandleToULong( GetPropW( hwnd, display_device_guid_propW )); + } memcpy( key, key_pathW, sizeof(key_pathW) ); if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0; strcatW( key, displayW ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index e29153a..275b93c 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2086,9 +2086,6 @@ HWND WINAPI GetDesktopWindow(void) SERVER_END_REQ; } - /* wait for the desktop process to be ready */ - SendMessageW( thread_info->top_window, WM_NULL, 0, 0 ); - if (!thread_info->top_window || !USER_Driver->pCreateDesktopWindow( thread_info->top_window )) ERR( "failed to create desktop window\n" );

1 0

Alexandre Julliard : urlmon/tests: Fix handling of FINDINGRESOURCE now that all the tests are against the same server.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: deda14785a37fc31740e72a37644a0add558c44f URL: http://source.winehq.org/git/wine.git/?a=commit;h=deda14785a37fc31740e72a37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 4 10:49:22 2014 +0100 urlmon/tests: Fix handling of FINDINGRESOURCE now that all the tests are against the same server. --- dlls/urlmon/tests/url.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 6948102..f9a4ac3 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -189,6 +189,7 @@ static BOOL abort_start = FALSE; static BOOL abort_progress = FALSE; static BOOL async_switch = FALSE; static BOOL strict_bsc_qi; +static DWORD bindtest_flags; static const char *test_file; static WCHAR file_url[INTERNET_MAX_URL_LENGTH], current_url[INTERNET_MAX_URL_LENGTH]; @@ -1655,6 +1656,8 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u CHECK_EXPECT(Obj_OnProgress_FINDINGRESOURCE); else if(test_protocol == FTP_TEST) todo_wine CHECK_EXPECT(OnProgress_FINDINGRESOURCE); + else if(test_protocol == HTTPS_TEST && !bindtest_flags) + todo_wine CHECK_EXPECT(OnProgress_FINDINGRESOURCE); else CHECK_EXPECT(OnProgress_FINDINGRESOURCE); if(emulate_protocol && (test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST)) @@ -2806,6 +2809,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) const char *url_a = NULL; test_protocol = protocol; + bindtest_flags = flags; emulate_protocol = (flags & BINDTEST_EMULATE) != 0; download_state = BEFORE_DOWNLOAD; stopped_binding = FALSE; @@ -3979,7 +3983,6 @@ START_TEST(url) test_BindToStorage(WINETEST_TEST, BINDTEST_EMULATE|BINDTEST_NO_CALLBACK|BINDTEST_USE_CACHE, TYMED_ISTREAM); trace("asynchronous https test...\n"); - http_is_first = TRUE; test_BindToStorage(HTTPS_TEST, 0, TYMED_ISTREAM); trace("emulated https test...\n");

1 0

Dmitry Timoshkov : server: Fix generic access mapping for a semaphore.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: fdd483c083a1618ec2b15410d23472c585e40f16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd483c083a1618ec2b15410d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 31 15:28:04 2014 +0900 server: Fix generic access mapping for a semaphore. --- dlls/advapi32/tests/security.c | 16 ++++++---------- server/semaphore.c | 4 ++-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e649674..8f70faf 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4653,14 +4653,14 @@ static void test_semaphore_security(HANDLE token) STANDARD_RIGHTS_ALL | SEMAPHORE_ALL_ACCESS }; static const struct { - int todo, generic, mapped; + int generic, mapped; } map[] = { - { 0, 0, 0 }, - { 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 } + { 0, 0 }, + { GENERIC_READ, STANDARD_RIGHTS_READ | SEMAPHORE_QUERY_STATE }, + { GENERIC_WRITE, STANDARD_RIGHTS_WRITE | SEMAPHORE_MODIFY_STATE }, + { GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE }, + { GENERIC_ALL, STANDARD_RIGHTS_ALL | SEMAPHORE_QUERY_STATE | SEMAPHORE_MODIFY_STATE } }; SetLastError(0xdeadbeef); @@ -4683,10 +4683,6 @@ static void test_semaphore_security(HANDLE token) 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); diff --git a/server/semaphore.c b/server/semaphore.c index bdc35fe..d87325c 100644 --- a/server/semaphore.c +++ b/server/semaphore.c @@ -153,9 +153,9 @@ static void semaphore_satisfied( struct object *obj, struct wait_queue_entry *en static unsigned int semaphore_map_access( struct object *obj, unsigned int access ) { - if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE; + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SEMAPHORE_QUERY_STATE; if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | SEMAPHORE_MODIFY_STATE; - if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE; if (access & GENERIC_ALL) access |= STANDARD_RIGHTS_ALL | SEMAPHORE_ALL_ACCESS; return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); }

1 0

Dmitry Timoshkov : taskschd: Add IRegisteredTask stub implementation.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: 55b4f418c6082a7fbc32b9fed45e97262382dfb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b4f418c6082a7fbc32b9fed… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 31 17:21:27 2014 +0900 taskschd: Add IRegisteredTask stub implementation. --- dlls/taskschd/Makefile.in | 1 + dlls/taskschd/folder.c | 7 +- dlls/taskschd/regtask.c | 269 ++++++++++++++++++++++++++++++++++++++ dlls/taskschd/taskschd_private.h | 1 + 4 files changed, 276 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/Makefile.in b/dlls/taskschd/Makefile.in index 70a50a0..a1835fc 100644 --- a/dlls/taskschd/Makefile.in +++ b/dlls/taskschd/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = advapi32 oleaut32 C_SRCS = \ folder.c \ folder_collection.c \ + regtask.c \ task.c \ taskschd.c diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 1793a62..8d8a1a3 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -286,8 +286,11 @@ static HRESULT WINAPI TaskFolder_DeleteFolder(ITaskFolder *iface, BSTR name, LON static HRESULT WINAPI TaskFolder_GetTask(ITaskFolder *iface, BSTR path, IRegisteredTask **task) { - FIXME("%p,%s,%p: stub\n", iface, debugstr_w(path), task); - return E_NOTIMPL; + TRACE("%p,%s,%p\n", iface, debugstr_w(path), task); + + if (!task) return E_POINTER; + + return RegisteredTask_create(path, task); } static HRESULT WINAPI TaskFolder_GetTasks(ITaskFolder *iface, LONG flags, IRegisteredTaskCollection **tasks) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c new file mode 100644 index 0000000..c0a35a3 --- /dev/null +++ b/dlls/taskschd/regtask.c @@ -0,0 +1,269 @@ +/* + * Copyright 2014 Dmitry Timoshkov + * + * 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 + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "objbase.h" +#include "taskschd.h" +#include "taskschd_private.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(taskschd); + +typedef struct +{ + IRegisteredTask IRegisteredTask_iface; + LONG ref; + WCHAR *path; +} RegisteredTask; + +static inline RegisteredTask *impl_from_IRegisteredTask(IRegisteredTask *iface) +{ + return CONTAINING_RECORD(iface, RegisteredTask, IRegisteredTask_iface); +} + +static ULONG WINAPI regtask_AddRef(IRegisteredTask *iface) +{ + RegisteredTask *regtask = impl_from_IRegisteredTask(iface); + return InterlockedIncrement(&regtask->ref); +} + +static ULONG WINAPI regtask_Release(IRegisteredTask *iface) +{ + RegisteredTask *regtask = impl_from_IRegisteredTask(iface); + LONG ref = InterlockedDecrement(&regtask->ref); + + if (!ref) + { + TRACE("destroying %p\n", iface); + heap_free(regtask->path); + heap_free(regtask); + } + + return ref; +} + +static HRESULT WINAPI regtask_QueryInterface(IRegisteredTask *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_IRegisteredTask) || + IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IRegisteredTask_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 regtask_GetTypeInfoCount(IRegisteredTask *iface, UINT *count) +{ + FIXME("%p,%p: stub\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtask_GetTypeInfo(IRegisteredTask *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtask_GetIDsOfNames(IRegisteredTask *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 regtask_Invoke(IRegisteredTask *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 regtask_get_Name(IRegisteredTask *iface, BSTR *name) +{ + FIXME("%p,%p: stub\n", iface, name); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtask_get_Path(IRegisteredTask *iface, BSTR *path) +{ + FIXME("%p,%p: stub\n", iface, path); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtask_get_State(IRegisteredTask *iface, TASK_STATE *state) +{ + FIXME("%p,%p: stub\n", iface, state); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtask_get_Enabled(IRegisteredTask *iface, VARIANT_BOOL *enabled) +{ + FIXME("%p,%p: stub\n", iface, enabled); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtask_put_Enabled(IRegisteredTask *iface, VARIANT_BOOL enabled) +{ + FIXME("%p,%d: stub\n", iface, enabled); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtask_Run(IRegisteredTask *iface, VARIANT params, IRunningTask **task) +{ + FIXME("%p,%s,%p: stub\n", iface, debugstr_variant(&params), task); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtask_RunEx(IRegisteredTask *iface, VARIANT params, LONG flags, + LONG session_id, BSTR user, IRunningTask **task) +{ + FIXME("%p,%s,%x,%x,%s,%p: stub\n", iface, debugstr_variant(&params), flags, session_id, debugstr_w(user), task); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtask_GetInstances(IRegisteredTask *iface, LONG flags, IRunningTaskCollection **tasks) +{ + FIXME("%p,%x,%p: stub\n", iface, flags, tasks); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtask_get_LastRunTime(IRegisteredTask *iface, DATE *date) +{ + FIXME("%p,%p: stub\n", iface, date); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtask_get_LastTaskResult(IRegisteredTask *iface, LONG *result) +{ + FIXME("%p,%p: stub\n", iface, result); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtask_get_NumberOfMissedRuns(IRegisteredTask *iface, LONG *runs) +{ + FIXME("%p,%p: stub\n", iface, runs); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtask_get_NextRunTime(IRegisteredTask *iface, DATE *date) +{ + FIXME("%p,%p: stub\n", iface, date); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtask_get_Definition(IRegisteredTask *iface, ITaskDefinition **task) +{ + FIXME("%p,%p: stub\n", iface, task); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtask_get_Xml(IRegisteredTask *iface, BSTR *xml) +{ + FIXME("%p,%p: stub\n", iface, xml); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtask_GetSecurityDescriptor(IRegisteredTask *iface, LONG info, BSTR *sddl) +{ + FIXME("%p,%x,%p: stub\n", iface, info, sddl); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtask_SetSecurityDescriptor(IRegisteredTask *iface, BSTR sddl, LONG flags) +{ + FIXME("%p,%s,%x: stub\n", iface, debugstr_w(sddl), flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtask_Stop(IRegisteredTask *iface, LONG flags) +{ + FIXME("%p,%x: stub\n", iface, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI regtask_GetRunTimes(IRegisteredTask *iface, const LPSYSTEMTIME start, const LPSYSTEMTIME end, + DWORD *count, LPSYSTEMTIME *time) +{ + FIXME("%p,%p.%p,%p,%p: stub\n", iface, start, end, count, time); + return E_NOTIMPL; +} + +static const IRegisteredTaskVtbl RegisteredTask_vtbl = +{ + regtask_QueryInterface, + regtask_AddRef, + regtask_Release, + regtask_GetTypeInfoCount, + regtask_GetTypeInfo, + regtask_GetIDsOfNames, + regtask_Invoke, + regtask_get_Name, + regtask_get_Path, + regtask_get_State, + regtask_get_Enabled, + regtask_put_Enabled, + regtask_Run, + regtask_RunEx, + regtask_GetInstances, + regtask_get_LastRunTime, + regtask_get_LastTaskResult, + regtask_get_NumberOfMissedRuns, + regtask_get_NextRunTime, + regtask_get_Definition, + regtask_get_Xml, + regtask_GetSecurityDescriptor, + regtask_SetSecurityDescriptor, + regtask_Stop, + regtask_GetRunTimes +}; + +HRESULT RegisteredTask_create(const WCHAR *path, IRegisteredTask **obj) +{ + RegisteredTask *regtask; + + regtask = heap_alloc(sizeof(*regtask)); + if (!regtask) return E_OUTOFMEMORY; + + regtask->IRegisteredTask_iface.lpVtbl = &RegisteredTask_vtbl; + regtask->path = heap_strdupW(path); + regtask->ref = 1; + *obj = &regtask->IRegisteredTask_iface; + + TRACE("created %p\n", *obj); + + return S_OK; +} diff --git a/dlls/taskschd/taskschd_private.h b/dlls/taskschd/taskschd_private.h index 9837cd3..b1f5ff9 100644 --- a/dlls/taskschd/taskschd_private.h +++ b/dlls/taskschd/taskschd_private.h @@ -21,6 +21,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; const char *debugstr_variant(const VARIANT *v) DECLSPEC_HIDDEN;

1 0

Bruno Jesus : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: 67fc9fba8a16ec658d890063945158173d2a3aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=67fc9fba8a16ec658d8900639… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Feb 3 12:51:44 2014 -0200 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 6b33297..3a5e593 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -10132,7 +10132,7 @@ msgstr "Prompt de Comando Wine" #: cmd.rc:351 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: cmd.rc:352 msgid "More? " @@ -10202,10 +10202,8 @@ msgid "Wine Explorer" msgstr "Wine Explorer" #: explorer.rc:33 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "Inicialização" +msgstr "Iniciar" #: explorer.rc:34 winefile.rc:36 msgid "&Run..."

1 0