October 2015 - Wine-Commits

Hans Leidekker : webservices: Implement WsReadNode.
by Alexandre Julliard Oct. 9, 2015

Oct. 9, 2015

Module: wine Branch: master Commit: ef3e05ee5b6bcfa71eee53e1a9cc15f0666c2ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef3e05ee5b6bcfa71eee53e1a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 9 10:19:31 2015 +0200 webservices: Implement WsReadNode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 143 +++++++++++++++++++++++++- dlls/webservices/tests/reader.c | 207 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 348 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef3e05ee5b6bcfa71eee5…

1 0

Hans Leidekker : webservices: Implement WsReadType for a number of basic types.
by Alexandre Julliard Oct. 9, 2015

Oct. 9, 2015

Module: wine Branch: master Commit: 8c9600b9fadbff02bf67ce5a5ff3ffd1640dc02a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c9600b9fadbff02bf67ce5a5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 9 10:19:32 2015 +0200 webservices: Implement WsReadType for a number of basic types. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 277 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 265 ++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 543 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c9600b9fadbff02bf67c…

1 0

Huw Davies : ole32: Test the result of IRunningObjectTable_GetObject against S_OK.
by Alexandre Julliard Oct. 9, 2015

Oct. 9, 2015

Module: wine Branch: master Commit: 577644f3c1db5ddd74a22282698286b33a6b6fbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=577644f3c1db5ddd74a222826… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 11:13:22 2015 +0100 ole32: Test the result of IRunningObjectTable_GetObject against S_OK. Typically it would return MK_E_UNAVAILABLE and not S_FALSE if the moniker is not registered. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/filemoniker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index c9b4e50..6474d9a 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -500,7 +500,7 @@ FileMonikerImpl_BindToObject(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft /* if the requested class was loaded before ! we don't need to reload it */ res = IRunningObjectTable_GetObject(prot,iface,&pObj); - if (res==S_FALSE){ + if (res != S_OK){ /* first activation of this class */ res=GetClassFile(This->filePathName,&clsID); if (SUCCEEDED(res)){

1 0

Huw Davies : ole32: Don' t try to load a handler - the real server is needed.
by Alexandre Julliard Oct. 9, 2015

Oct. 9, 2015

Module: wine Branch: master Commit: d340f09a336b28534bacd717e21b021d9e05fff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d340f09a336b28534bacd717e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 11:13:23 2015 +0100 ole32: Don't try to load a handler - the real server is needed. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/filemoniker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 6474d9a..9586be9 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -505,7 +505,7 @@ FileMonikerImpl_BindToObject(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft res=GetClassFile(This->filePathName,&clsID); if (SUCCEEDED(res)){ - res=CoCreateInstance(&clsID,NULL,CLSCTX_ALL,&IID_IPersistFile,(void**)&ppf); + res=CoCreateInstance(&clsID,NULL,CLSCTX_SERVER,&IID_IPersistFile,(void**)&ppf); if (SUCCEEDED(res)){ res=IPersistFile_Load(ppf,This->filePathName,STGM_READ);

1 0

Michael Müller : wininet: Disabling proxy should return success when no proxy was enabled.
by Alexandre Julliard Oct. 9, 2015

Oct. 9, 2015

Module: wine Branch: master Commit: 54a390b4ac31e2fac4a476976db6d67055971bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a390b4ac31e2fac4a476976… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Oct 9 01:29:53 2015 +0200 wininet: Disabling proxy should return success when no proxy was enabled. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index c64816e..9045b03 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -359,7 +359,7 @@ static LONG INTERNET_SaveProxySettings( proxyinfo_t *lpwpi ) } else { - if ((ret = RegDeleteValueW( key, szProxyServer ))) + if ((ret = RegDeleteValueW( key, szProxyServer )) && ret != ERROR_FILE_NOT_FOUND) { RegCloseKey( key ); return ret;

1 0

Nikolay Sivov : wiaservc: Added a stub for IEnumWIA_DEV_INFO.
by Alexandre Julliard Oct. 9, 2015

Oct. 9, 2015

Module: wine Branch: master Commit: 9cb1981e304bc54e9378ae52a5367d9db576872a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb1981e304bc54e9378ae52a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 8 21:09:11 2015 +0300 wiaservc: Added a stub for IEnumWIA_DEV_INFO. Based on original patch by Mikael Ståldal <mikael(a)staldal.nu>. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wiaservc/tests/wia.c | 4 +- dlls/wiaservc/wiadevmgr.c | 127 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 125 insertions(+), 6 deletions(-) diff --git a/dlls/wiaservc/tests/wia.c b/dlls/wiaservc/tests/wia.c index e3f4edb..c7c2fd9 100644 --- a/dlls/wiaservc/tests/wia.c +++ b/dlls/wiaservc/tests/wia.c @@ -40,21 +40,19 @@ static void test_EnumDeviceInfo(void) ok(FAILED(hr), "got 0x%08x\n", hr); hr = IWiaDevMgr_EnumDeviceInfo(devmanager, WIA_DEVINFO_ENUM_LOCAL, &devenum); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { hr = IEnumWIA_DEV_INFO_GetCount(devenum, NULL); ok(FAILED(hr), "got 0x%08x\n", hr); count = 1000; hr = IEnumWIA_DEV_INFO_GetCount(devenum, &count); +todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok(count != 1000, "got %u\n", count); IEnumWIA_DEV_INFO_Release(devenum); } -} START_TEST(wia) { diff --git a/dlls/wiaservc/wiadevmgr.c b/dlls/wiaservc/wiadevmgr.c index 6eb82aa..58720ef 100644 --- a/dlls/wiaservc/wiadevmgr.c +++ b/dlls/wiaservc/wiadevmgr.c @@ -29,11 +29,119 @@ WINE_DEFAULT_DEBUG_CHANNEL(wia); +typedef struct +{ + IEnumWIA_DEV_INFO IEnumWIA_DEV_INFO_iface; + LONG ref; +} enumwiadevinfo; + static inline wiadevmgr *impl_from_IWiaDevMgr(IWiaDevMgr *iface) { return CONTAINING_RECORD(iface, wiadevmgr, IWiaDevMgr_iface); } +static inline enumwiadevinfo *impl_from_IEnumWIA_DEV_INFO(IEnumWIA_DEV_INFO *iface) +{ + return CONTAINING_RECORD(iface, enumwiadevinfo, IEnumWIA_DEV_INFO_iface); +} + +static HRESULT WINAPI enumwiadevinfo_QueryInterface(IEnumWIA_DEV_INFO *iface, REFIID riid, void **obj) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumWIA_DEV_INFO)) + *obj = iface; + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; + } + IUnknown_AddRef((IUnknown*)*obj); + return S_OK; +} + +static ULONG WINAPI enumwiadevinfo_AddRef(IEnumWIA_DEV_INFO *iface) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; +} + +static ULONG WINAPI enumwiadevinfo_Release(IEnumWIA_DEV_INFO *iface) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%u)\n", This, ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + return ref; +} + +static HRESULT WINAPI enumwiadevinfo_Next(IEnumWIA_DEV_INFO *iface, ULONG count, IWiaPropertyStorage **elem, ULONG *fetched) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + + FIXME("(%p, %d, %p, %p): stub\n", This, count, elem, fetched); + + *fetched = 0; + return E_NOTIMPL; +} + +static HRESULT WINAPI enumwiadevinfo_Skip(IEnumWIA_DEV_INFO *iface, ULONG count) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + + FIXME("(%p, %u): stub\n", This, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI enumwiadevinfo_Reset(IEnumWIA_DEV_INFO *iface) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + + FIXME("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI enumwiadevinfo_Clone(IEnumWIA_DEV_INFO *iface, IEnumWIA_DEV_INFO **ret) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + + FIXME("(%p, %p): stub\n", This, ret); + + return E_NOTIMPL; +} + +static HRESULT WINAPI enumwiadevinfo_GetCount(IEnumWIA_DEV_INFO *iface, ULONG *count) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + + FIXME("(%p, %p): stub\n", This, count); + + *count = 0; + return E_NOTIMPL; +} + +static const IEnumWIA_DEV_INFOVtbl EnumWIA_DEV_INFOVtbl = +{ + enumwiadevinfo_QueryInterface, + enumwiadevinfo_AddRef, + enumwiadevinfo_Release, + enumwiadevinfo_Next, + enumwiadevinfo_Skip, + enumwiadevinfo_Reset, + enumwiadevinfo_Clone, + enumwiadevinfo_GetCount +}; + static HRESULT WINAPI wiadevmgr_QueryInterface(IWiaDevMgr *iface, REFIID riid, void **ppvObject) { wiadevmgr *This = impl_from_IWiaDevMgr(iface); @@ -69,11 +177,24 @@ static ULONG WINAPI wiadevmgr_Release(IWiaDevMgr *iface) return ref; } -static HRESULT WINAPI wiadevmgr_EnumDeviceInfo(IWiaDevMgr *iface, LONG lFlag, IEnumWIA_DEV_INFO **ppIEnum) +static HRESULT WINAPI wiadevmgr_EnumDeviceInfo(IWiaDevMgr *iface, LONG flag, IEnumWIA_DEV_INFO **ret) { wiadevmgr *This = impl_from_IWiaDevMgr(iface); - FIXME("(%p, %d, %p): stub\n", This, lFlag, ppIEnum); - return E_NOTIMPL; + enumwiadevinfo *enuminfo; + + TRACE("(%p)->(%x, %p)\n", This, flag, ret); + + *ret = NULL; + + enuminfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*enuminfo)); + if (!enuminfo) + return E_OUTOFMEMORY; + + enuminfo->IEnumWIA_DEV_INFO_iface.lpVtbl = &EnumWIA_DEV_INFOVtbl; + enuminfo->ref = 1; + + *ret = &enuminfo->IEnumWIA_DEV_INFO_iface; + return S_OK; } static HRESULT WINAPI wiadevmgr_CreateDevice(IWiaDevMgr *iface, BSTR bstrDeviceID, IWiaItem **ppWiaItemRoot)

1 0

Jacek Caban : kernel32: Improved WTSGetActiveConsoleSessionId stub.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: ebb320fa37f2ad27649f571946af038e9d70ced2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebb320fa37f2ad27649f57194… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 8 14:20:50 2015 +0200 kernel32: Improved WTSGetActiveConsoleSessionId stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index c03cdc7..5e6ab10 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3876,7 +3876,8 @@ DWORD WINAPI WTSGetActiveConsoleSessionId(void) { static int once; if (!once++) FIXME("stub\n"); - return 0; + /* Return current session id. */ + return NtCurrentTeb()->Peb->SessionId; } /**********************************************************************

1 0

Jacek Caban : ntdll: Initialize PEB SessionId to 1.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: 19e16319b85ba2a50ed187435da50c1ef75d6a46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19e16319b85ba2a50ed187435… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 8 14:19:43 2015 +0200 ntdll: Initialize PEB SessionId to 1. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 9f49cd4..aaf7a71 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -280,6 +280,12 @@ HANDLE thread_init(void) #endif #endif + /* + * Starting with Vista, the first user to log on has session id 1. + * Session id 0 is for processes that don't interact with the user (like services). + */ + peb->SessionId = 1; + /* allocate and initialize the initial TEB */ signal_alloc_thread( &teb );

1 0

Jacek Caban : kernel32: Use session id stored in PEB in ProcessIdToSessionId.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: 888d1c67bbd065422d1929e7cf9df23cb4aee93a URL: http://source.winehq.org/git/wine.git/?a=commit;h=888d1c67bbd065422d1929e7c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 8 14:20:05 2015 +0200 kernel32: Use session id stored in PEB in ProcessIdToSessionId. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index b0c06e3..c03cdc7 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3742,10 +3742,10 @@ BOOL WINAPI K32GetProcessMemoryInfo(HANDLE process, */ BOOL WINAPI ProcessIdToSessionId( DWORD procid, DWORD *sessionid_ptr ) { - /* According to MSDN, if the calling process is not in a terminal - * services environment, then the sessionid returned is zero. - */ - *sessionid_ptr = 0; + if (procid != GetCurrentProcessId()) + FIXME("Unsupported for other processes.\n"); + + *sessionid_ptr = NtCurrentTeb()->Peb->SessionId; return TRUE; }

1 0

Jacek Caban : kernel32: Added session id tests.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: e4e1b89732604c4be17c137e490d2e9710172f65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4e1b89732604c4be17c137e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 8 14:20:17 2015 +0200 kernel32: Added session id tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 8447323..6dc1f5e 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -77,6 +77,8 @@ static BOOL (WINAPI *pSetInformationJobObject)(HANDLE job, JOBOBJECTINFOCLASS static HANDLE (WINAPI *pCreateIoCompletionPort)(HANDLE file, HANDLE existing_port, ULONG_PTR key, DWORD threads); static BOOL (WINAPI *pGetNumaProcessorNode)(UCHAR, PUCHAR); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); +static BOOL (WINAPI *pProcessIdToSessionId)(DWORD,DWORD*); +static DWORD (WINAPI *pWTSGetActiveConsoleSessionId)(void); /* ############################### */ static char base[MAX_PATH]; @@ -233,6 +235,8 @@ static BOOL init(void) pSetInformationJobObject = (void *)GetProcAddress(hkernel32, "SetInformationJobObject"); pCreateIoCompletionPort = (void *)GetProcAddress(hkernel32, "CreateIoCompletionPort"); pGetNumaProcessorNode = (void *)GetProcAddress(hkernel32, "GetNumaProcessorNode"); + pProcessIdToSessionId = (void *)GetProcAddress(hkernel32, "ProcessIdToSessionId"); + pWTSGetActiveConsoleSessionId = (void *)GetProcAddress(hkernel32, "WTSGetActiveConsoleSessionId"); return TRUE; } @@ -2788,6 +2792,25 @@ static void test_GetNumaProcessorNode(void) } } +static void test_session_info(void) +{ + DWORD session_id, active_session; + BOOL r; + + if (!pProcessIdToSessionId) + { + win_skip("ProcessIdToSessionId is missing\n"); + return; + } + + r = pProcessIdToSessionId(GetCurrentProcessId(), &session_id); + ok(r, "ProcessIdToSessionId failed: %u\n", GetLastError()); + trace("session_id = %x\n", session_id); + + active_session = pWTSGetActiveConsoleSessionId(); + trace("active_session = %x\n", active_session); +} + static void test_process_info(void) { char buf[4096]; @@ -2994,6 +3017,8 @@ START_TEST(process) test_DuplicateHandle(); test_StartupNoConsole(); test_GetNumaProcessorNode(); + test_session_info(); + /* things that can be tested: * lookup: check the way program to be executed is searched * handles: check the handle inheritance stuff (+sec options)

1 0