February 2014 - Wine-Commits

André Hentschel : taskmgr: Avoid return type when the return value is not used.
by Alexandre Julliard Feb. 4, 2014

Feb. 4, 2014

Module: wine Branch: master Commit: 810fbdd222a87022436b6eb8cebee627b9d00248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=810fbdd222a87022436b6eb8c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 29 22:25:09 2014 +0100 taskmgr: Avoid return type when the return value is not used. --- programs/taskmgr/graphctl.c | 3 +-- programs/taskmgr/graphctl.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/taskmgr/graphctl.c b/programs/taskmgr/graphctl.c index 25632f8..6e83412 100644 --- a/programs/taskmgr/graphctl.c +++ b/programs/taskmgr/graphctl.c @@ -153,13 +153,12 @@ static void GraphCtrl_Resize(TGraphCtrl* this) this->m_dVerticalFactor = (double)this->m_nPlotHeight / this->m_dRange; } -BOOL GraphCtrl_Create(TGraphCtrl* this, HWND hWnd, HWND hParentWnd, UINT nID) +void GraphCtrl_Create(TGraphCtrl* this, HWND hWnd, HWND hParentWnd, UINT nID) { GraphCtrl_Init(this); this->m_hParentWnd = hParentWnd; this->m_hWnd = hWnd; GraphCtrl_Resize(this); - return 0; } static void GraphCtrl_InvalidateCtrl(TGraphCtrl* this) diff --git a/programs/taskmgr/graphctl.h b/programs/taskmgr/graphctl.h index cd7cec4..2adb494 100644 --- a/programs/taskmgr/graphctl.h +++ b/programs/taskmgr/graphctl.h @@ -89,8 +89,7 @@ extern WNDPROC OldGraphCtrlWndProc; double GraphCtrl_AppendPoint(TGraphCtrl* this, double dNewPoint0, double dNewPoint1, double dNewPoint2, double dNewPoint3); -BOOL GraphCtrl_Create(TGraphCtrl* this, HWND hWnd, HWND hParentWnd, -UINT nID); +void GraphCtrl_Create(TGraphCtrl* this, HWND hWnd, HWND hParentWnd, UINT nID); void GraphCtrl_Reset(TGraphCtrl* this); void GraphCtrl_SetBackgroundColor(TGraphCtrl* this, COLORREF color);

1 0

André Hentschel : gdi16: Use boolean return value in boolean function.
by Alexandre Julliard Feb. 4, 2014

Feb. 4, 2014

Module: wine Branch: master Commit: f43234289dda0b547cd083e7aa88c380b4742ab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f43234289dda0b547cd083e7a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 29 22:28:31 2014 +0100 gdi16: Use boolean return value in boolean function. --- dlls/gdi.exe16/gdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index c2193a9..8ee37d7 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -2907,7 +2907,7 @@ BOOL16 WINAPI IsGDIObject16( HGDIOBJ16 handle16 ) UINT type = GetObjectType( HGDIOBJ_32( handle16 )); - if (type >= sizeof(type_map)/sizeof(type_map[0])) return 0; + if (type >= sizeof(type_map)/sizeof(type_map[0])) return FALSE; return type_map[type]; }

1 0

André Hentschel : msi: Use boolean return value in boolean function.
by Alexandre Julliard Feb. 4, 2014

Feb. 4, 2014

Module: wine Branch: master Commit: 3c1ca4e548a5249060515fda9e241f4643fedc3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c1ca4e548a5249060515fda9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 29 22:28:29 2014 +0100 msi: Use boolean return value in boolean function. --- dlls/msi/record.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 3c1cf00..88d94a9 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -378,7 +378,7 @@ BOOL WINAPI MsiRecordIsNull( MSIHANDLE handle, UINT iField ) rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) - return 0; + return FALSE; msiobj_lock( &rec->hdr ); ret = MSI_RecordIsNull( rec, iField ); msiobj_unlock( &rec->hdr );

1 0

André Hentschel : advapi32: Use boolean return values in boolean functions.
by Alexandre Julliard Feb. 4, 2014

Feb. 4, 2014

Module: wine Branch: master Commit: 929d9fb9f79b9ba0b7392215e51a152ec709d62c URL: http://source.winehq.org/git/wine.git/?a=commit;h=929d9fb9f79b9ba0b7392215e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 29 22:25:44 2014 +0100 advapi32: Use boolean return values in boolean functions. --- dlls/advapi32/advapi.c | 2 +- dlls/advapi32/security.c | 2 +- dlls/advapi32/service.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 884b5d1..01ee4de 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -136,7 +136,7 @@ BOOL WINAPI GetCurrentHwProfileA(LPHW_PROFILE_INFOA pInfo) pInfo->dwDockInfo = DOCKINFO_DOCKED; strcpy(pInfo->szHwProfileGuid,"{12340001-1234-1234-1234-123456789012}"); strcpy(pInfo->szHwProfileName,"Wine Profile"); - return 1; + return TRUE; } /****************************************************************************** diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index ac0a941..3dc40dc 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2399,7 +2399,7 @@ BOOL WINAPI NotifyBootConfigStatus( BOOL x1 ) { FIXME("(0x%08d):stub\n",x1); - return 1; + return TRUE; } /****************************************************************************** diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 5f3f15f..0047031 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1858,7 +1858,7 @@ BOOL WINAPI GetServiceKeyNameW( SC_HANDLE hSCManager, LPCWSTR lpDisplayName, if (!hSCManager) { SetLastError( ERROR_INVALID_HANDLE ); - return 0; + return FALSE; } /* provide a buffer if the caller didn't */ @@ -1982,7 +1982,7 @@ BOOL WINAPI GetServiceDisplayNameW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, if (!hSCManager) { SetLastError( ERROR_INVALID_HANDLE ); - return 0; + return FALSE; } /* provide a buffer if the caller didn't */

1 0

André Hentschel : comctl32: Use boolean return values in boolean functions.
by Alexandre Julliard Feb. 4, 2014

Feb. 4, 2014

Module: wine Branch: master Commit: 1776ded8e68f48546337705d30392d8ace7dd053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1776ded8e68f48546337705d3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 29 22:26:05 2014 +0100 comctl32: Use boolean return values in boolean functions. --- dlls/comctl32/datetime.c | 2 +- dlls/comctl32/updown.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index d13b50c..9f91fd3 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -198,7 +198,7 @@ static BOOL DATETIME_IsDateInValidRange(const DATETIME_INFO *infoPtr, const SYST static BOOL DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *systime) { - if (!systime) return 0; + if (!systime) return FALSE; TRACE("%04d/%02d/%02d %02d:%02d:%02d\n", systime->wYear, systime->wMonth, systime->wDay, diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 23a633e..28dd5e3 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -354,7 +354,7 @@ static BOOL UPDOWN_SetBuddyInt (const UPDOWN_INFO *infoPtr) /* if nothing changed exit earlier */ GetWindowTextW(infoPtr->Buddy, txt_old, sizeof(txt_old)/sizeof(WCHAR)); - if (lstrcmpiW(txt_old, txt) == 0) return 0; + if (lstrcmpiW(txt_old, txt) == 0) return FALSE; return SetWindowTextW(infoPtr->Buddy, txt); }

1 0

Alexandre Julliard : urlmon/tests: Fix handling of FINDINGRESOURCE now that all the tests are against the same server.
by Alexandre Julliard Feb. 4, 2014

Feb. 4, 2014

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

Bruno Jesus : po: Update Brazilian Portuguese translation.
by Alexandre Julliard Feb. 4, 2014

Feb. 4, 2014

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

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

Feb. 4, 2014

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 Feb. 4, 2014

Feb. 4, 2014

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

Alexandre Julliard : user32: Only wait for the desktop process when necessary.
by Alexandre Julliard Feb. 4, 2014

Feb. 4, 2014

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