April 2015 - Wine-commits - list.winehq.org

Nikolay Sivov : dwrite: Add cluster metrics entry for inline objects too.
by Alexandre Julliard 06 Apr '15

06 Apr '15

Module: wine Branch: master Commit: b16432f2c293e6f122ebf83cc893152ca2e3714d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b16432f2c293e6f122ebf83cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 4 14:05:52 2015 +0300 dwrite: Add cluster metrics entry for inline objects too. --- dlls/dwrite/layout.c | 172 +++++++++++++++++++++++++++++---------------- dlls/dwrite/tests/layout.c | 12 ++-- 2 files changed, 115 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b16432f2c293e6f122ebf…

1 0

Nikolay Sivov : dmscript: Implement GetClassID() for IDirectMusicTrack.
by Alexandre Julliard 06 Apr '15

06 Apr '15

Module: wine Branch: master Commit: 52251ac6da29c261501029c8868368c37840a69b URL: http://source.winehq.org/git/wine.git/?a=commit;h=52251ac6da29c261501029c88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 4 14:07:00 2015 +0300 dmscript: Implement GetClassID() for IDirectMusicTrack. --- dlls/dmscript/scripttrack.c | 12 ++++++++++-- dlls/dmscript/tests/dmscript.c | 8 ++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index ddae8b5..bc8e8ce 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -264,7 +264,15 @@ static ULONG WINAPI IPersistStreamImpl_Release(IPersistStream *iface) static HRESULT WINAPI IPersistStreamImpl_GetClassID(IPersistStream *iface, CLSID *pClassID) { - return E_NOTIMPL; + DirectMusicScriptTrack *This = impl_from_IPersistStream(iface); + + TRACE("(%p, %p)\n", This, pClassID); + + if (!pClassID) + return E_POINTER; + + *pClassID = This->desc.guidClass; + return S_OK; } static HRESULT WINAPI IPersistStreamImpl_IsDirty(IPersistStream *iface) @@ -319,7 +327,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack(REFIID riid, void **ret_iface track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->IPersistStream_iface.lpVtbl = &persist_vtbl; track->desc.dwSize = sizeof(track->desc); - track->desc.dwValidData |= DMUS_OBJ_CLASS; + track->desc.dwValidData = DMUS_OBJ_CLASS; track->desc.guidClass = CLSID_DirectMusicScriptTrack; track->ref = 1; diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index 59858d5..82e874c 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -217,9 +217,13 @@ static void test_scripttrack(void) /* IPersistStream */ hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + + hr = IPersistStream_GetClassID(ps, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); - todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicScriptTrack), + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, &CLSID_DirectMusicScriptTrack), "Expected class CLSID_DirectMusicScriptTrack got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */

1 0

Nikolay Sivov : ole32: Remove a couple of interface casts.
by Alexandre Julliard 06 Apr '15

06 Apr '15

Module: wine Branch: master Commit: 961b1a270f709264ba3d32345ec7fedb1247efc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=961b1a270f709264ba3d32345… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 4 14:37:07 2015 +0300 ole32: Remove a couple of interface casts. --- dlls/ole32/compobj.c | 4 ++-- dlls/ole32/defaulthandler.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d842aaf..762f011 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4952,8 +4952,8 @@ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) else context->apttype = APTTYPE_STA; - hr = IUnknown_QueryInterface((IUnknown *)&context->IComThreadingInfo_iface, riid, ppv); - IUnknown_Release((IUnknown *)&context->IComThreadingInfo_iface); + hr = IComThreadingInfo_QueryInterface(&context->IComThreadingInfo_iface, riid, ppv); + IComThreadingInfo_Release(&context->IComThreadingInfo_iface); return hr; } diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 5e89977..913d4af 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -2185,7 +2185,7 @@ HRESULT HandlerCF_Create(REFCLSID rclsid, REFIID riid, LPVOID *ppv) This->refs = 0; This->clsid = *rclsid; - hr = IUnknown_QueryInterface((IUnknown *)&This->IClassFactory_iface, riid, ppv); + hr = IClassFactory_QueryInterface(&This->IClassFactory_iface, riid, ppv); if (FAILED(hr)) HeapFree(GetProcessHeap(), 0, This);

1 0

Nikolay Sivov : browseui: Return interface pointer instead of impl pointer.
by Alexandre Julliard 06 Apr '15

06 Apr '15

Module: wine Branch: master Commit: 77a63b724564514f41da29aecc595c7ef323e716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77a63b724564514f41da29aec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 4 14:39:26 2015 +0300 browseui: Return interface pointer instead of impl pointer. --- dlls/browseui/aclmulti.c | 2 +- dlls/browseui/aclsource.c | 2 +- dlls/browseui/compcatcachedaemon.c | 2 +- dlls/browseui/progressdlg.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index e7edece..6deb30d 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -325,7 +325,7 @@ HRESULT ACLMulti_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->refCount = 1; TRACE("returning %p\n", This); - *ppOut = (IUnknown *)This; + *ppOut = (IUnknown *)&This->IEnumString_iface; BROWSEUI_refCount++; return S_OK; } diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c index aa31d08..07033cc 100644 --- a/dlls/browseui/aclsource.c +++ b/dlls/browseui/aclsource.c @@ -147,6 +147,6 @@ HRESULT ACLShellSource_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->refCount = 1; TRACE("returning %p\n", This); - *ppOut = (IUnknown *)This; + *ppOut = (IUnknown *)&This->IACList2_iface; return S_OK; } diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index 5ed9f37..a5c97e9 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -158,7 +158,7 @@ HRESULT CompCatCacheDaemon_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": CompCatCacheDaemon.cs"); TRACE("returning %p\n", This); - *ppOut = (IUnknown *)This; + *ppOut = (IUnknown *)&This->IRunnableTask_iface; InterlockedIncrement(&BROWSEUI_refCount); return S_OK; } diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 7d07ee9..70c78c9 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -579,7 +579,7 @@ HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ProgressDialog.cs"); TRACE("returning %p\n", This); - *ppOut = (IUnknown *)This; + *ppOut = (IUnknown *)&This->IProgressDialog_iface; InterlockedIncrement(&BROWSEUI_refCount); return S_OK; }

1 0

Bruno Jesus : ws2_32: Fix copy & paste error in fd_sets_to_poll (Coverity) .
by Alexandre Julliard 06 Apr '15

06 Apr '15

Module: wine Branch: master Commit: 5c8aad8d76828dd60a4e9d3639d546eaa586d68a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8aad8d76828dd60a4e9d363… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Apr 5 11:48:57 2015 -0300 ws2_32: Fix copy & paste error in fd_sets_to_poll (Coverity). --- dlls/ws2_32/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d8d724b..7f3134e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4625,7 +4625,7 @@ static struct pollfd *fd_sets_to_poll( const WS_fd_set *readfds, const WS_fd_set } else { - release_sock_fd( readfds->fd_array[i], fds[j].fd ); + release_sock_fd( writefds->fd_array[i], fds[j].fd ); fds[j].fd = -1; fds[j].events = 0; } @@ -4650,7 +4650,7 @@ static struct pollfd *fd_sets_to_poll( const WS_fd_set *readfds, const WS_fd_set } else { - release_sock_fd( readfds->fd_array[i], fds[j].fd ); + release_sock_fd( exceptfds->fd_array[i], fds[j].fd ); fds[j].fd = -1; fds[j].events = 0; }

1 0

Mark Harmstone : kernel32: Stub out GetFileMUIPath.
by Alexandre Julliard 06 Apr '15

06 Apr '15

Module: wine Branch: master Commit: ed0c6746dd66f88939ee7623c521f81aa6704f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed0c6746dd66f88939ee7623c… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Apr 4 17:09:09 2015 +0100 kernel32: Stub out GetFileMUIPath. --- .../api-ms-win-core-localization-l1-2-0.spec | 2 +- .../api-ms-win-core-localization-l1-2-1.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/locale.c | 15 +++++++++++++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec index e2a7bed..d5daa65 100644 --- a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec +++ b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec @@ -12,7 +12,7 @@ @ stdcall GetCalendarInfoEx(wstr long ptr long ptr long ptr) kernel32.GetCalendarInfoEx @ stdcall GetCalendarInfoW(long long long ptr long ptr) kernel32.GetCalendarInfoW @ stub GetFileMUIInfo -@ stub GetFileMUIPath +@ stdcall GetFileMUIPath(long wstr wstr ptr ptr ptr ptr) kernel32.GetFileMUIPath @ stdcall GetGeoInfoW(long long ptr long long) kernel32.GetGeoInfoW @ stdcall GetLocaleInfoA(long long ptr long) kernel32.GetLocaleInfoA @ stdcall GetLocaleInfoEx(wstr long ptr long) kernel32.GetLocaleInfoEx diff --git a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec index 32d2c76..50e113e 100644 --- a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec +++ b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec @@ -13,7 +13,7 @@ @ stdcall GetCalendarInfoEx(wstr long ptr long ptr long ptr) kernel32.GetCalendarInfoEx @ stdcall GetCalendarInfoW(long long long ptr long ptr) kernel32.GetCalendarInfoW @ stub GetFileMUIInfo -@ stub GetFileMUIPath +@ stdcall GetFileMUIPath(long wstr wstr ptr ptr ptr ptr) kernel32.GetFileMUIPath @ stdcall GetGeoInfoW(long long ptr long long) kernel32.GetGeoInfoW @ stdcall GetLocaleInfoA(long long ptr long) kernel32.GetLocaleInfoA @ stdcall GetLocaleInfoEx(wstr long ptr long) kernel32.GetLocaleInfoEx diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d94c307..130affc 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -677,7 +677,7 @@ @ stdcall GetFileInformationByHandle(long ptr) @ stdcall GetFileInformationByHandleEx(long long ptr long) # @ stub GetFileMUIInfo -# @ stub GetFileMUIPath +@ stdcall GetFileMUIPath(long wstr wstr ptr ptr ptr ptr) @ stdcall GetFileSize(long ptr) @ stdcall GetFileSizeEx(long ptr) @ stdcall GetFileTime(long ptr ptr ptr) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 7798b91..9896872 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -5300,3 +5300,18 @@ BOOL WINAPI GetUserPreferredUILanguages(DWORD flags, PULONG numlangs, PZZWSTR la FIXME( "stub: %u %p %p %p\n", flags, numlangs, langbuffer, bufferlen ); return FALSE; } + +/****************************************************************************** + * GetFileMUIPath (KERNEL32.@) + */ + +BOOL WINAPI GetFileMUIPath(DWORD flags, PCWSTR filepath, PWSTR language, PULONG languagelen, + PWSTR muipath, PULONG muipathlen, PULONGLONG enumerator) +{ + FIXME("stub: 0x%x, %s, %s, %p, %p, %p, %p\n", flags, debugstr_w(filepath), + debugstr_w(language), languagelen, muipath, muipathlen, enumerator); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + return FALSE; +}

1 0

Mark Harmstone : uxtheme: Fix off-by-one error in array size.
by Alexandre Julliard 06 Apr '15

06 Apr '15

Module: wine Branch: master Commit: 1a9810b3857487bba14f4a50f6de183a25b5f7a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a9810b3857487bba14f4a50f… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Apr 4 11:35:43 2015 +0100 uxtheme: Fix off-by-one error in array size. --- dlls/uxtheme/msstyles.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 8205a12..780751b 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -674,8 +674,8 @@ static PTHEME_PROPERTY MSSTYLES_AddMetric(PTHEME_FILE tf, int iPropertyPrimitive struct PARSECOLORSTATE { int colorCount; - int colorElements[TMT_LASTCOLOR-TMT_FIRSTCOLOR]; - COLORREF colorRgb[TMT_LASTCOLOR-TMT_FIRSTCOLOR]; + int colorElements[TMT_LASTCOLOR-TMT_FIRSTCOLOR+1]; + COLORREF colorRgb[TMT_LASTCOLOR-TMT_FIRSTCOLOR+1]; int captionColors; };

1 0

Andrew Cook : ntdll: Return success for JobObjectBasicUIRestrictions.
by Alexandre Julliard 06 Apr '15

06 Apr '15

Module: wine Branch: master Commit: 4113fd875c4eaf1fe5d05080f7059c641572a5c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4113fd875c4eaf1fe5d05080f… Author: Andrew Cook <ariscop(a)gmail.com> Date: Sun Apr 5 07:04:25 2015 +1000 ntdll: Return success for JobObjectBasicUIRestrictions. --- dlls/ntdll/sync.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index a4df88a..5db736e 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -634,7 +634,7 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c */ NTSTATUS WINAPI NtSetInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS class, PVOID info, ULONG len ) { - NTSTATUS status = STATUS_SUCCESS; + NTSTATUS status = STATUS_NOT_IMPLEMENTED; JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit; ULONG info_size = sizeof(JOBOBJECT_BASIC_LIMIT_INFORMATION); DWORD limit_flags = JOB_OBJECT_BASIC_LIMIT_VALID_FLAGS; @@ -683,9 +683,11 @@ NTSTATUS WINAPI NtSetInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS cla SERVER_END_REQ; break; + case JobObjectBasicUIRestrictions: + status = STATUS_SUCCESS; + /* fallthrough */ default: FIXME( "stub: %p %u %p %u\n", handle, class, info, len ); - return STATUS_NOT_IMPLEMENTED; } return status;

1 0

Jason Overland : winecfg: Add owner to file picker dialogs, making them modal.
by Alexandre Julliard 06 Apr '15

06 Apr '15

Module: wine Branch: master Commit: 4b18b0d10e7e193b0992ad1f67062894df1b42e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b18b0d10e7e193b0992ad1f6… Author: Jason Overland <jasonoverland(a)gmail.com> Date: Sun Apr 5 22:44:48 2015 -0700 winecfg: Add owner to file picker dialogs, making them modal. --- programs/winecfg/appdefaults.c | 2 +- programs/winecfg/theme.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 49531fa..fad9e5c 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -326,7 +326,7 @@ static void on_add_app_click(HWND dialog) static const WCHAR pathC[] = { 'c',':','\\',0 }; OPENFILENAMEW ofn = { sizeof(OPENFILENAMEW), - 0, /*hInst*/0, 0, NULL, 0, 0, NULL, + dialog, /*hInst*/0, 0, NULL, 0, 0, NULL, 0, NULL, 0, pathC, 0, OFN_SHOWHELP | OFN_HIDEREADONLY | OFN_ENABLESIZING, 0, 0, NULL, 0, NULL }; diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 6db602f..8ffc9bb 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -635,7 +635,7 @@ static void on_theme_install(HWND dialog) title, sizeof (title) / sizeof (title[0])); ofn.lStructSize = sizeof(OPENFILENAMEW); - ofn.hwndOwner = 0; + ofn.hwndOwner = dialog; ofn.hInstance = 0; ofn.lpstrFilter = filter; ofn.lpstrCustomFilter = NULL;

1 0

Michael Müller : ws2_32: Don' t return an error in WS_select when EINTR happens during timeout.
by Alexandre Julliard 06 Apr '15

06 Apr '15

Module: wine Branch: master Commit: 0601c86542b16c452c014d5a9a3d6d57e6476796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0601c86542b16c452c014d5a9… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Mar 28 20:47:52 2015 +0100 ws2_32: Don't return an error in WS_select when EINTR happens during timeout. --- dlls/ws2_32/socket.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7f3134e..9d5067a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4780,7 +4780,11 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds, } timeout = torig - (tv2.tv_sec * 1000) - (tv2.tv_usec + 999) / 1000; - if (timeout <= 0) break; + if (timeout <= 0) + { + ret = 0; + break; + } } else break; } release_poll_fds( ws_readfds, ws_writefds, ws_exceptfds, pollfds );

1 0