wine-commits February 2014

wine-commits@winehq.org

2 participants
503 discussions

André Hentschel : taskmgr: Avoid return type when the return value is not used.
by Alexandre Julliard 04 Feb '14

04 Feb '14

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

Marcus Meissner : kernel32/tests: Initial threadpool test.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: 5d58b92b73129459c82532d4d582bfc547d24e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d58b92b73129459c82532d4d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 29 20:13:28 2014 +0100 kernel32/tests: Initial threadpool test. --- dlls/kernel32/tests/thread.c | 46 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 964ad02..6cbf383 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -19,7 +19,7 @@ */ /* Define _WIN32_WINNT to get SetThreadIdealProcessor on Windows */ -#define _WIN32_WINNT 0x0500 +#define _WIN32_WINNT 0x0600 #include <assert.h> #include <stdarg.h> @@ -82,6 +82,11 @@ static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); static void (WINAPI *pReleaseActCtx)(HANDLE); +static PTP_POOL (WINAPI *pCreateThreadpool)(PVOID); +static PTP_WORK (WINAPI *pCreateThreadpoolWork)(PTP_WORK_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); +static void (WINAPI *pSubmitThreadpoolWork)(PTP_WORK); +static void (WINAPI *pWaitForThreadpoolWorkCallbacks)(PTP_WORK,BOOL); +static void (WINAPI *pCloseThreadpoolWork)(PTP_WORK); static HANDLE create_target_process(const char *arg) { @@ -1599,6 +1604,37 @@ static void test_thread_actctx(void) pReleaseActCtx(context); } + +static void WINAPI threadpool_workcallback(PTP_CALLBACK_INSTANCE instance, void *context, PTP_WORK work) { + int *foo = (int*)context; + + (*foo)++; +} + + +static void test_threadpool(void) +{ + PTP_POOL pool; + PTP_WORK work; + int workcalled = 0; + + if (!pCreateThreadpool) { + todo_wine win_skip("thread pool apis not supported.\n"); + return; + } + + work = pCreateThreadpoolWork(threadpool_workcallback, &workcalled, NULL); + ok (work != NULL, "Error %d in CreateThreadpoolWork\n", GetLastError()); + pSubmitThreadpoolWork(work); + pWaitForThreadpoolWorkCallbacks(work, FALSE); + pCloseThreadpoolWork(work); + + ok (workcalled == 1, "expected work to be called once, got %d\n", workcalled); + + pool = pCreateThreadpool(NULL); + todo_wine ok (pool != NULL, "CreateThreadpool failed\n"); +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -1622,6 +1658,12 @@ static void init_funcs(void) X(DeactivateActCtx); X(GetCurrentActCtx); X(ReleaseActCtx); + + X(CreateThreadpool); + X(CreateThreadpoolWork); + X(SubmitThreadpoolWork); + X(WaitForThreadpoolWorkCallbacks); + X(CloseThreadpoolWork); #undef X } @@ -1687,4 +1729,6 @@ START_TEST(thread) test_thread_fpu_cw(); #endif test_thread_actctx(); + + test_threadpool(); }

1 0

Marcus Meissner : kernel32: Thread pool definitions and prototypes.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: cef12abd4f7496ee6c21e80b6bf58b981876135f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef12abd4f7496ee6c21e80b6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 29 20:13:27 2014 +0100 kernel32: Thread pool definitions and prototypes. --- include/winbase.h | 5 +++++ include/winnt.h | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index 2d01c45..889f018 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1572,6 +1572,8 @@ WINADVAPI BOOL WINAPI ClearEventLogW(HANDLE,LPCWSTR); #define ClearEventLog WINELIB_NAME_AW(ClearEventLog) WINADVAPI BOOL WINAPI CloseEventLog(HANDLE); WINBASEAPI BOOL WINAPI CloseHandle(HANDLE); +WINBASEAPI VOID WINAPI CloseThreadpool(PTP_POOL); +WINBASEAPI VOID WINAPI CloseThreadpoolWork(PTP_WORK); WINBASEAPI BOOL WINAPI CommConfigDialogA(LPCSTR,HWND,LPCOMMCONFIG); WINBASEAPI BOOL WINAPI CommConfigDialogW(LPCWSTR,HWND,LPCOMMCONFIG); #define CommConfigDialog WINELIB_NAME_AW(CommConfigDialog) @@ -1633,6 +1635,8 @@ WINBASEAPI HANDLE WINAPI CreateNamedPipeW(LPCWSTR,DWORD,DWORD,DWORD,DWORD,D #define CreateNamedPipe WINELIB_NAME_AW(CreateNamedPipe) WINBASEAPI BOOL WINAPI CreatePipe(PHANDLE,PHANDLE,LPSECURITY_ATTRIBUTES,DWORD); WINADVAPI BOOL WINAPI CreatePrivateObjectSecurity(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,BOOL,HANDLE,PGENERIC_MAPPING); +WINBASEAPI PTP_POOL WINAPI CreateThreadpool(PVOID); +WINBASEAPI PTP_WORK WINAPI CreateThreadpoolWork(PTP_WORK_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); WINBASEAPI BOOL WINAPI CreateProcessA(LPCSTR,LPSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCSTR,LPSTARTUPINFOA,LPPROCESS_INFORMATION); WINBASEAPI BOOL WINAPI CreateProcessW(LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION); #define CreateProcess WINELIB_NAME_AW(CreateProcess) @@ -2365,6 +2369,7 @@ WINBASEAPI VOID WINAPI Sleep(DWORD); WINBASEAPI BOOL WINAPI SleepConditionVariableCS(PCONDITION_VARIABLE,PCRITICAL_SECTION,DWORD); WINBASEAPI BOOL WINAPI SleepConditionVariableSRW(PCONDITION_VARIABLE,PSRWLOCK,DWORD,ULONG); WINBASEAPI DWORD WINAPI SleepEx(DWORD,BOOL); +WINBASEAPI VOID WINAPI SubmitThreadpoolWork(PTP_WORK); WINBASEAPI DWORD WINAPI SuspendThread(HANDLE); WINBASEAPI void WINAPI SwitchToFiber(LPVOID); WINBASEAPI BOOL WINAPI SwitchToThread(void); diff --git a/include/winnt.h b/include/winnt.h index f55f2fe..dd4ef63 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5699,6 +5699,71 @@ typedef struct _SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX } DUMMYUNIONNAME; } SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX; +/* Threadpool things */ +typedef DWORD TP_VERSION,*PTP_VERSION; + +typedef struct _TP_CALLBACK_INSTANCE TP_CALLBACK_INSTANCE,*PTP_CALLBACK_INSTANCE; + +typedef VOID (CALLBACK *PTP_SIMPLE_CALLBACK)(PTP_CALLBACK_INSTANCE,PVOID); + +typedef struct _TP_POOL TP_POOL,*PTP_POOL; + +typedef enum _TP_CALLBACK_PRIORITY +{ + TP_CALLBACK_PRIORITY_HIGH, + TP_CALLBACK_PRIORITY_NORMAL, + TP_CALLBACK_PRIORITY_LOW, + TP_CALLBACK_PRIORITY_INVALID, + TP_CALLBACK_PRIORITY_COUNT = TP_CALLBACK_PRIORITY_INVALID +} TP_CALLBACK_PRIORITY; + +typedef struct _TP_POOL_STACK_INFORMATION +{ + SIZE_T StackReserve; + SIZE_T StackCommit; +} TP_POOL_STACK_INFORMATION,*PTP_POOL_STACK_INFORMATION; + +typedef struct _TP_CLEANUP_GROUP TP_CLEANUP_GROUP,*PTP_CLEANUP_GROUP; + +typedef VOID (CALLBACK *PTP_CLEANUP_GROUP_CANCEL_CALLBACK)(PVOID,PVOID); + +typedef struct _TP_CALLBACK_ENVIRON_V1 +{ + TP_VERSION Version; + PTP_POOL Pool; + PTP_CLEANUP_GROUP CleanupGroup; + PTP_CLEANUP_GROUP_CANCEL_CALLBACK CleanupGroupCancelCallback; + PVOID RaceDll; + struct _ACTIVATION_CONTEXT* ActivationContext; + PTP_SIMPLE_CALLBACK FinalizationCallback; + union + { + DWORD Flags; + struct + { + DWORD LongFunction:1; + DWORD Persistent:1; + DWORD Private:30; + } s; + } u; +} TP_CALLBACK_ENVIRON_V1; + +typedef struct _TP_WORK TP_WORK, *PTP_WORK; +typedef struct _TP_TIMER TP_TIMER, *PTP_TIMER; + +typedef DWORD TP_WAIT_RESULT; +typedef struct _TP_WAIT TP_WAIT, *PTP_WAIT; + +typedef struct _TP_IO TP_IO, *PTP_IO; + +typedef TP_CALLBACK_ENVIRON_V1 TP_CALLBACK_ENVIRON, *PTP_CALLBACK_ENVIRON; + +typedef VOID (CALLBACK *PTP_WORK_CALLBACK)(PTP_CALLBACK_INSTANCE,PVOID,PTP_WORK); +typedef VOID (CALLBACK *PTP_TIMER_CALLBACK)(PTP_CALLBACK_INSTANCE,PVOID,PTP_TIMER); +typedef VOID (CALLBACK *PTP_WAIT_CALLBACK)(PTP_CALLBACK_INSTANCE,PVOID,PTP_WAIT,TP_WAIT_RESULT); +typedef VOID (CALLBACK *PTP_WIN32_IO_CALLBACK)(PTP_CALLBACK_INSTANCE,PVOID,PVOID,ULONG,ULONG_PTR,PTP_IO); + + NTSYSAPI BOOLEAN NTAPI RtlGetProductInfo(DWORD,DWORD,DWORD,DWORD,PDWORD); #ifdef __cplusplus

1 0

Nikolay Sivov : oleaut32: Fix RecordCopy()/RecordClear() behavior.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: 60252ea65bbdf991938d919cd4c734809fb899bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=60252ea65bbdf991938d919cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 30 22:53:13 2014 +0400 oleaut32: Fix RecordCopy()/RecordClear() behavior. --- dlls/oleaut32/recinfo.c | 75 +++++++++++++++++++++- dlls/oleaut32/tests/test_tlb.idl | 6 +- dlls/oleaut32/tests/typelib.c | 3 +- dlls/oleaut32/tests/vartype.c | 130 ++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/usrmarshal.c | 3 +- dlls/oleaut32/variant.h | 2 +- 6 files changed, 212 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=60252ea65bbdf991938d9…

1 0

Nikolay Sivov : wshom: Implement Arguments() property for a shortcut.
by Alexandre Julliard 04 Feb '14

04 Feb '14

Module: wine Branch: master Commit: f608c5d2ae7ee0dc82fbf2bae9ae82b7f8dbe5ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=f608c5d2ae7ee0dc82fbf2bae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 4 10:24:30 2014 +0400 wshom: Implement Arguments() property for a shortcut. --- dlls/wshom.ocx/shell.c | 24 ++++++++++++++++++++---- dlls/wshom.ocx/tests/wshom.c | 11 ++++++++--- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 385d2a3..2dc2bbe 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -394,15 +394,31 @@ static HRESULT WINAPI WshShortcut_get_FullName(IWshShortcut *iface, BSTR *name) static HRESULT WINAPI WshShortcut_get_Arguments(IWshShortcut *iface, BSTR *Arguments) { WshShortcut *This = impl_from_IWshShortcut(iface); - FIXME("(%p)->(%p): stub\n", This, Arguments); - return E_NOTIMPL; + WCHAR buffW[INFOTIPSIZE]; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, Arguments); + + if (!Arguments) + return E_POINTER; + + *Arguments = NULL; + + hr = IShellLinkW_GetArguments(This->link, buffW, sizeof(buffW)/sizeof(WCHAR)); + if (FAILED(hr)) + return hr; + + *Arguments = SysAllocString(buffW); + return S_OK; } static HRESULT WINAPI WshShortcut_put_Arguments(IWshShortcut *iface, BSTR Arguments) { WshShortcut *This = impl_from_IWshShortcut(iface); - FIXME("(%p)->(%s): stub\n", This, debugstr_w(Arguments)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(Arguments)); + + return IShellLinkW_SetArguments(This->link, Arguments); } static HRESULT WINAPI WshShortcut_get_Description(IWshShortcut *iface, BSTR *Description) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 50adb90..0e01304 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -40,8 +40,9 @@ static void test_wshshell(void) IDispatchEx *dispex; IWshCollection *coll; IDispatch *disp, *shortcut; - IUnknown *shell, *unk; + IUnknown *shell; IFolderCollection *folders; + IWshShortcut *shcut; ITypeInfo *ti; HRESULT hr; TYPEATTR *tattr; @@ -109,9 +110,13 @@ static void test_wshshell(void) hr = IWshShell3_CreateShortcut(sh3, str, &shortcut); EXPECT_HR(hr, S_OK); SysFreeString(str); - hr = IDispatch_QueryInterface(shortcut, &IID_IWshShortcut, (void**)&unk); + hr = IDispatch_QueryInterface(shortcut, &IID_IWshShortcut, (void**)&shcut); EXPECT_HR(hr, S_OK); - IUnknown_Release(unk); + + hr = IWshShortcut_get_Arguments(shcut, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + IWshShortcut_Release(shcut); IDispatch_Release(shortcut); /* ExpandEnvironmentStrings */

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

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

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

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

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2014