October 2015 - Wine-commits

Huw Davies : ole32: Test the result of IRunningObjectTable_GetObject against S_OK.
by Alexandre Julliard 09 Oct '15

09 Oct '15

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 09 Oct '15

09 Oct '15

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

Huw Davies : ole32: Add a stub for OleCreateFromFileEx.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: 94ee4096ec4459105e8f22d39be843ae65980420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94ee4096ec4459105e8f22d39… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 11:13:24 2015 +0100 ole32: Add a stub for OleCreateFromFileEx. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj_private.h | 2 ++ dlls/ole32/datacache.c | 2 +- dlls/ole32/ole2impl.c | 31 +++++++++++++++++++++++++++++++ dlls/ole32/ole2stubs.c | 11 ----------- dlls/ole32/ole32.spec | 4 ++-- include/ole2.h | 3 +++ 6 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index c63d645..857943a 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -315,6 +315,8 @@ extern LSTATUS open_classes_key(HKEY, const WCHAR *, REGSAM, HKEY *) DECLSPEC_HI extern BOOL actctx_get_miscstatus(const CLSID*, DWORD, DWORD*) DECLSPEC_HIDDEN; +extern const char *debugstr_formatetc(const FORMATETC *formatetc) DECLSPEC_HIDDEN; + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 1076a37..2e2478a 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -216,7 +216,7 @@ static inline DataCache *impl_from_IAdviseSink( IAdviseSink *iface ) return CONTAINING_RECORD(iface, DataCache, IAdviseSink_iface); } -static const char * debugstr_formatetc(const FORMATETC *formatetc) +const char *debugstr_formatetc(const FORMATETC *formatetc) { return wine_dbg_sprintf("{ cfFormat = 0x%x, ptd = %p, dwAspect = %d, lindex = %d, tymed = %d }", formatetc->cfFormat, formatetc->ptd, formatetc->dwAspect, diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index 4be79a7..71b0145 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -233,6 +233,37 @@ HRESULT WINAPI OleCreateStaticFromData(IDataObject *data, REFIID iid, } /****************************************************************************** + * OleCreateFromFileEx [OLE32.@] + */ +HRESULT WINAPI OleCreateFromFileEx(REFCLSID clsid, const OLECHAR *filename, REFIID iid, DWORD flags, + DWORD renderopt, ULONG num_fmts, DWORD *adv_flags, FORMATETC *fmts, IAdviseSink *sink, + DWORD *conns, IOleClientSite *client_site, IStorage *stg, void **obj) +{ + ULONG i; + + FIXME("%s: stub!\n", debugstr_w(filename)); + TRACE("cls %s, %s, iid %s, flags %d, render opts %d, num fmts %d, adv flags %p, fmts %p\n", debugstr_guid(clsid), + debugstr_w(filename), debugstr_guid(iid), flags, renderopt, num_fmts, adv_flags, fmts); + TRACE("sink %p, conns %p, client site %p, storage %p, obj %p\n", sink, conns, client_site, stg, obj); + for (i = 0; i < num_fmts; i++) + TRACE("\t%d: fmt %s adv flags %d\n", i, debugstr_formatetc(fmts + i), adv_flags[i]); + + return E_NOTIMPL; +} + +/****************************************************************************** + * OleCreateFromFile [OLE32.@] + */ +HRESULT WINAPI OleCreateFromFile(REFCLSID clsid, const OLECHAR *filename, REFIID iid, DWORD renderopt, + FORMATETC *fmt, IOleClientSite *client_site, IStorage *storage, void **obj) +{ + DWORD advf = ADVF_PRIMEFIRST; + + return OleCreateFromFileEx(clsid, filename, iid, 0, renderopt, fmt ? 1 : 0, fmt ? &advf : NULL, fmt, + NULL, NULL, client_site, storage, obj); +} + +/****************************************************************************** * OleDuplicateData [OLE32.@] * * Duplicates clipboard data. diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c index ba32165..de35747 100644 --- a/dlls/ole32/ole2stubs.c +++ b/dlls/ole32/ole2stubs.c @@ -52,17 +52,6 @@ HRESULT WINAPI OleCreateLink(LPMONIKER pmkLinkSrc, REFIID riid, DWORD renderopt, } /****************************************************************************** - * OleCreateFromFile [OLE32.@] - */ -HRESULT WINAPI OleCreateFromFile(REFCLSID rclsid, LPCOLESTR lpszFileName, REFIID riid, - DWORD renderopt, LPFORMATETC lpFormatEtc, LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj) -{ - FIXME("(not shown), stub!\n"); - return E_NOTIMPL; -} - - -/****************************************************************************** * OleGetIconOfClass [OLE32.@] */ HGLOBAL WINAPI OleGetIconOfClass(REFCLSID rclsid, LPOLESTR lpszLabel, BOOL fUseTypeAsLabel) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 8c4e8e3..04c9f1e 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -188,8 +188,8 @@ @ stub OleCreateEx @ stdcall OleCreateFromData(ptr ptr long ptr ptr ptr ptr) @ stdcall OleCreateFromDataEx(ptr ptr long long long ptr ptr ptr ptr ptr ptr ptr) -@ stdcall OleCreateFromFile(ptr ptr ptr long ptr ptr ptr ptr) -@ stub OleCreateFromFileEx +@ stdcall OleCreateFromFile(ptr wstr ptr long ptr ptr ptr ptr) +@ stdcall OleCreateFromFileEx(ptr wstr ptr long long long ptr ptr ptr ptr ptr ptr ptr) @ stdcall OleCreateLink(ptr ptr long ptr ptr ptr ptr) @ stub OleCreateLinkEx @ stdcall OleCreateLinkFromData(ptr ptr long ptr ptr ptr ptr) diff --git a/include/ole2.h b/include/ole2.h index a555c70..05c1b55 100644 --- a/include/ole2.h +++ b/include/ole2.h @@ -107,6 +107,9 @@ HGLOBAL WINAPI OleMetafilePictFromIconAndLabel(HICON hIcon, LPOLESTR lpszLab HRESULT WINAPI OleLockRunning(LPUNKNOWN pUnknown, BOOL fLock, BOOL fLastUnlockCloses); HRESULT WINAPI OleCreateFromFile(REFCLSID rclsid, LPCOLESTR lpszFileName, REFIID riid, DWORD renderopt, LPFORMATETC lpFormatEtc, LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj); +HRESULT WINAPI OleCreateFromFileEx(REFCLSID clsid, LPCOLESTR filename, REFIID iid, DWORD flags, + DWORD renderopt, ULONG num_fmts, DWORD *adv_flags, LPFORMATETC fmts, IAdviseSink *sink, + DWORD *conns, LPOLECLIENTSITE client_site, LPSTORAGE storage, LPVOID* obj); HRESULT WINAPI OleCreateLink(LPMONIKER pmkLinkSrc, REFIID riid, DWORD renderopt, LPFORMATETC lpFormatEtc, LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj); HRESULT WINAPI OleCreate(REFCLSID rclsid, REFIID riid, DWORD renderopt, LPFORMATETC pFormatEtc, LPOLECLIENTSITE pClientSite,

1 0

Huw Davies : ole32: Implement OleCreateFromFileEx.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: 09cd89c0cc667789611a5edbd35d47379f14527d URL: http://source.winehq.org/git/wine.git/?a=commit;h=09cd89c0cc667789611a5edbd… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 11:13:25 2015 +0100 ole32: Implement OleCreateFromFileEx. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2impl.c | 76 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 63 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index 71b0145..cdc54be 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -97,7 +97,7 @@ static inline void init_fmtetc(FORMATETC *fmt, CLIPFORMAT cf, TYMED tymed) * * FIXME: CF_FILENAME. */ -static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf) +static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf, BOOL other_fmts) { static const UINT fmt_id[] = { CF_METAFILEPICT, CF_BITMAP, CF_DIB }; UINT i; @@ -107,7 +107,7 @@ static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf) IPersistStorage *persist; CLSID clsid; - *src_cf = 0; + if (src_cf) *src_cf = 0; /* CF_EMBEDEDOBJECT */ init_fmtetc(&fmt, embedded_object_clipboard_format, TYMED_ISTORAGE); @@ -116,7 +116,7 @@ static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf) hr = IDataObject_GetDataHere(data, &fmt, &med); if(SUCCEEDED(hr)) { - *src_cf = embedded_object_clipboard_format; + if (src_cf) *src_cf = embedded_object_clipboard_format; return hr; } @@ -127,18 +127,21 @@ static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf) hr = IDataObject_GetDataHere(data, &fmt, &med); if(SUCCEEDED(hr)) { - *src_cf = embed_source_clipboard_format; + if (src_cf) *src_cf = embed_source_clipboard_format; return hr; } - for (i = 0; i < sizeof(fmt_id)/sizeof(fmt_id[0]); i++) + if (other_fmts) { - init_fmtetc(&fmt, fmt_id[i], TYMED_ISTORAGE); - hr = IDataObject_QueryGetData(data, &fmt); - if(SUCCEEDED(hr)) + for (i = 0; i < sizeof(fmt_id)/sizeof(fmt_id[0]); i++) { - *src_cf = fmt_id[i]; - return hr; + init_fmtetc(&fmt, fmt_id[i], TYMED_ISTORAGE); + hr = IDataObject_QueryGetData(data, &fmt); + if (SUCCEEDED(hr)) + { + if (src_cf) *src_cf = fmt_id[i]; + return hr; + } } } @@ -181,7 +184,7 @@ HRESULT WINAPI OleCreateFromDataEx(IDataObject *data, REFIID iid, DWORD flags, data, debugstr_guid(iid), flags, renderopt, num_cache_fmts, adv_flags, cache_fmts, sink, conns, client_site, stg, obj); - hr = get_storage(data, stg, &src_cf); + hr = get_storage(data, stg, &src_cf, TRUE); if(FAILED(hr)) return hr; hr = OleLoad(stg, iid, client_site, obj); @@ -239,16 +242,63 @@ HRESULT WINAPI OleCreateFromFileEx(REFCLSID clsid, const OLECHAR *filename, REFI DWORD renderopt, ULONG num_fmts, DWORD *adv_flags, FORMATETC *fmts, IAdviseSink *sink, DWORD *conns, IOleClientSite *client_site, IStorage *stg, void **obj) { + HRESULT hr; + IMoniker *mon; + IDataObject *data; + IUnknown *unk = NULL; + IOleCache *cache = NULL; ULONG i; - FIXME("%s: stub!\n", debugstr_w(filename)); TRACE("cls %s, %s, iid %s, flags %d, render opts %d, num fmts %d, adv flags %p, fmts %p\n", debugstr_guid(clsid), debugstr_w(filename), debugstr_guid(iid), flags, renderopt, num_fmts, adv_flags, fmts); TRACE("sink %p, conns %p, client site %p, storage %p, obj %p\n", sink, conns, client_site, stg, obj); for (i = 0; i < num_fmts; i++) TRACE("\t%d: fmt %s adv flags %d\n", i, debugstr_formatetc(fmts + i), adv_flags[i]); - return E_NOTIMPL; + hr = CreateFileMoniker( filename, &mon ); + if (FAILED(hr)) return hr; + + hr = BindMoniker( mon, 0, &IID_IDataObject, (void**)&data ); + IMoniker_Release( mon ); + if (FAILED(hr)) return hr; + + hr = get_storage( data, stg, NULL, FALSE ); + if (FAILED(hr)) goto end; + + hr = OleLoad( stg, &IID_IUnknown, client_site, (void**)&unk ); + if (FAILED(hr)) goto end; + + if (renderopt == OLERENDER_FORMAT) + { + hr = IUnknown_QueryInterface( unk, &IID_IOleCache, (void**)&cache ); + if (FAILED(hr)) goto end; + + for (i = 0; i < num_fmts; i++) + { + STGMEDIUM med; + DWORD dummy_conn; + + memset( &med, 0, sizeof(med) ); + hr = IDataObject_GetData( data, fmts + i, &med ); + if (FAILED(hr)) goto end; + hr = IOleCache_Cache( cache, fmts + i, adv_flags[i], &dummy_conn ); + if (SUCCEEDED(hr)) + hr = IOleCache_SetData( cache, fmts + i, &med, TRUE ); + if (FAILED(hr)) + { + ReleaseStgMedium( &med ); + goto end; + } + } + } + + hr = IUnknown_QueryInterface( unk, iid, obj ); + +end: + if (cache) IOleCache_Release( cache ); + if (unk) IUnknown_Release( unk ); + IDataObject_Release( data ); + return hr; } /******************************************************************************

1 0

Michael Müller : wininet: Disabling proxy should return success when no proxy was enabled.
by Alexandre Julliard 09 Oct '15

09 Oct '15

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

Sebastian Lackner : wininet/tests: Add test for using NULL as proxy server.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: e609b398180f09db95576f7d69a8d730f9939b81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e609b398180f09db95576f7d6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 9 01:30:11 2015 +0200 wininet/tests: Add test for using NULL as proxy server. 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/tests/internet.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 2efde07..5636d4b 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1349,6 +1349,35 @@ static void test_Option_PerConnectionOptionA(void) HeapFree(GetProcessHeap(), 0, list.pOptions[0].Value.pszValue); HeapFree(GetProcessHeap(), 0, list.pOptions); + /* test with NULL as proxy server */ + list.dwOptionCount = 1; + list.pOptions = HeapAlloc(GetProcessHeap(), 0, sizeof(INTERNET_PER_CONN_OPTIONA)); + list.pOptions[0].dwOption = INTERNET_PER_CONN_PROXY_SERVER; + list.pOptions[0].Value.pszValue = NULL; + + ret = InternetSetOptionA(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, &list, size); + ok(ret == TRUE, "InternetSetOption should've succeeded\n"); + + ret = InternetSetOptionA(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, &list, size); + ok(ret == TRUE, "InternetSetOption should've succeeded\n"); + + HeapFree(GetProcessHeap(), 0, list.pOptions); + + /* get & verify the proxy server */ + list.dwOptionCount = 1; + list.dwOptionError = 0; + list.pOptions = HeapAlloc(GetProcessHeap(), 0, sizeof(INTERNET_PER_CONN_OPTIONA)); + list.pOptions[0].dwOption = INTERNET_PER_CONN_PROXY_SERVER; + + ret = InternetQueryOptionA(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, &list, &size); + ok(ret == TRUE, "InternetQueryOption should've succeeded\n"); + ok(!list.pOptions[0].Value.pszValue, + "Retrieved proxy server should've been NULL, was: \"%s\"\n", + list.pOptions[0].Value.pszValue); + + HeapFree(GetProcessHeap(), 0, list.pOptions[0].Value.pszValue); + HeapFree(GetProcessHeap(), 0, list.pOptions); + /* restore original settings */ list.dwOptionCount = 2; list.pOptions = orig_settings;

1 0

Jacek Caban : ntdll: Initialize PEB SessionId to 1.
by Alexandre Julliard 08 Oct '15

08 Oct '15

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 08 Oct '15

08 Oct '15

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 08 Oct '15

08 Oct '15

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

Jacek Caban : kernel32: Improved WTSGetActiveConsoleSessionId stub.
by Alexandre Julliard 08 Oct '15

08 Oct '15

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