April 2018 - Wine-devel - list.winehq.org

[PATCH 1/9] mstask: Implement IPersistFile::GetClassID().
by Dmitry Timoshkov 20 Apr '18

20 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 10 +++++----- dlls/mstask/tests/task_scheduler.c | 8 ++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 34d1fa010e..c4e9f84a3f 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -703,12 +703,12 @@ static ULONG WINAPI MSTASK_IPersistFile_Release( return ref; } -static HRESULT WINAPI MSTASK_IPersistFile_GetClassID( - IPersistFile* iface, - CLSID *pClassID) +static HRESULT WINAPI MSTASK_IPersistFile_GetClassID(IPersistFile *iface, CLSID *clsid) { - FIXME("(%p, %p): stub\n", iface, pClassID); - return E_NOTIMPL; + TRACE("(%p, %p)\n", iface, clsid); + + *clsid = CLSID_CTask; + return S_OK; } static HRESULT WINAPI MSTASK_IPersistFile_IsDirty( diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index e1e76e8c9c..ddbb66068f 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -278,6 +278,7 @@ static WCHAR *get_task_curfile(ITask *task) HRESULT hr; IPersistFile *pfile; WCHAR *curfile; + CLSID clsid; hr = ITask_QueryInterface(task, &IID_IPersistFile, (void **)&pfile); ok(hr == S_OK, "QueryInterface error %#x\n", hr); @@ -288,6 +289,13 @@ todo_wine todo_wine ok(curfile && curfile[0] , "curfile should not be NULL\n"); + if (0) /* crashes under Windows */ + hr = IPersistFile_GetClassID(pfile, NULL); + + hr = IPersistFile_GetClassID(pfile, &clsid); + ok(hr == S_OK, "GetClassID error %#x\n", hr); + ok(IsEqualCLSID(&clsid, &CLSID_CTask), "got %s\n", wine_dbgstr_guid(&clsid)); + IPersistFile_Release(pfile); return curfile; -- 2.16.3

1 0

[PATCH 3/7] wsdapi: Build and write Types list for Hello message.
by Owen Rudge 20 Apr '18

20 Apr '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+)

3 5

[PATCH 5/7] wsdapi: Build and write Scopes and XAddrs lists for Hello message.
by Owen Rudge 20 Apr '18

20 Apr '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+)

3 2

[PATCH] include/wfext.h: add miscellaneous FM_* defines
by Austin English 20 Apr '18

20 Apr '18

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- include/wfext.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/include/wfext.h b/include/wfext.h index 366e49f759..bcd9cfc0c8 100644 --- a/include/wfext.h +++ b/include/wfext.h @@ -22,6 +22,39 @@ extern "C" { #endif +#define MENU_TEXT_LEN 40 + +#define FMMENU_FIRST 1 +#define FMMENU_LAST 99 + +#define FMEVENT_LOAD 100 +#define FMEVENT_UNLOAD 101 +#define FMEVENT_INITMENU 102 +#define FMEVENT_USER_REFRESH 103 +#define FMEVENT_SELCHANGE 104 +#define FMEVENT_TOOLBARLOAD 105 +#define FMEVENT_HELPSTRING 106 +#define FMEVENT_HELPMENUITEM 107 + +#define FMFOCUS_DIR 1 +#define FMFOCUS_TREE 2 +#define FMFOCUS_DRIVES 3 +#define FMFOCUS_SEARCH 4 + +#define FM_GETFOCUS (WM_USER + 0x0200) +#define FM_GETSELCOUNT (WM_USER + 0x0202) +#define FM_GETSELCOUNTLFN (WM_USER + 0x0203) +#define FM_REFRESH_WINDOWS (WM_USER + 0x0206) +#define FM_RELOAD_EXTENSIONS (WM_USER + 0x0207) + +#define FM_GETDRIVEINFOA (WM_USER + 0x0201) +#define FM_GETFILESELA (WM_USER + 0x0204) +#define FM_GETFILESELLFNA (WM_USER + 0x0205) + +#define FM_GETDRIVEINFOW (WM_USER + 0x0211) +#define FM_GETFILESELW (WM_USER + 0x0214) +#define FM_GETFILESELLFNW (WM_USER + 0x0215) + LONG WINAPI FMExtensionProc(HWND,WORD,LONG); LONG WINAPI FMExtensionProcW(HWND,WORD,LONG); -- 2.16.1

1 0

[PATCH 1/7] wsdapi: Write EndPointReference section in Hello message body.
by Owen Rudge 20 Apr '18

20 Apr '18

Resend, was evidently too quick last night and the testbot hadn't updated. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 21 +++++++++++++++++++-- dlls/wsdapi/tests/discovery.c | 2 +- 2 files changed, 20 insertions(+), 3 deletions(-)

2 1

[PATCH 7/7] wsdapi: Add MetadataVersion to Hello message.
by Owen Rudge 20 Apr '18

20 Apr '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 7 +++++++ dlls/wsdapi/tests/discovery.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-)

1 0

[PATCH 6/7] wsdapi/tests: Add tests for Scopes and XAddrs lists.
by Owen Rudge 20 Apr '18

20 Apr '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-)

1 0

[PATCH 4/7] wsdapi/tests: Add tests for Types list.
by Owen Rudge 20 Apr '18

20 Apr '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-)

1 0

[PATCH 2/7] wsdapi/tests: Add test for endpoint reference "any" parameter.
by Owen Rudge 20 Apr '18

20 Apr '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)

1 0

Re: [PATCH] shell32: Avoid some exception when property Set and Commit in shell32.dll
by Guillaume Gill 20 Apr '18

20 Apr '18

Hi, I sent this patch for the second time, and I not understand why it's not applicable... It my first contribution, so maybe something forgotten in the process ? Thanks for your support ________________________________ From: Marvin <testbot(a)winehq.org> Sent: Thursday, April 19, 2018 11:54:31 PM To: Guillaume Gill Subject: Re: [PATCH] shell32: Avoid some exception when property Set and Commit in shell32.dll Thank you for your contribution to Wine! This is an automated notification to let you know that your patch has been reviewed and its status set to "Apply failure". This means that git-apply refused to apply the patch. This could be either because it got mangled in transit, it's not relative to the latest git, or it conflicts with someone else's patch in the same area. You need to resend an updated patch. If you do not understand the reason for this status, disagree with our assessment, or are simply not sure how to proceed next, please ask for clarification by replying to this email.

2 1