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

Grazvydas Ignotas : port.h: Make use of compiler support for 32bit atomic ops.
by Alexandre Julliard 12 May '15

12 May '15

Module: wine Branch: master Commit: 4419edd79c152c268a26e63a28923aee755a5a66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4419edd79c152c268a26e63a2… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Tue May 12 03:17:35 2015 +0300 port.h: Make use of compiler support for 32bit atomic ops. --- include/wine/port.h | 24 ++++++++++++++++++++++-- libs/port/interlocked.c | 6 ++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index 3548a44..16127e0 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -435,12 +435,32 @@ static inline unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_ #else /* __GNUC__ */ +#ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 +static inline int interlocked_cmpxchg( int *dest, int xchg, int compare ) +{ + return __sync_val_compare_and_swap( dest, compare, xchg ); +} + +static inline int interlocked_xchg_add( int *dest, int incr ) +{ + return __sync_fetch_and_add( dest, incr ); +} + +static inline int interlocked_xchg( int *dest, int val ) +{ + int ret; + do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); + return ret; +} +#else extern int interlocked_cmpxchg( int *dest, int xchg, int compare ); +extern int interlocked_xchg_add( int *dest, int incr ); +extern int interlocked_xchg( int *dest, int val ); +#endif + extern void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ); extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ); -extern int interlocked_xchg( int *dest, int val ); extern void *interlocked_xchg_ptr( void **dest, void *val ); -extern int interlocked_xchg_add( int *dest, int incr ); #if defined(__x86_64__) || defined(__aarch64__) || defined(_WIN64) extern unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ); diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index f5e405c..e5b1bb9 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -274,6 +274,7 @@ void* interlocked_xchg_ptr( void** dest, void* val ) static pthread_mutex_t interlocked_mutex = PTHREAD_MUTEX_INITIALIZER; +#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 int interlocked_cmpxchg( int *dest, int xchg, int compare ) { pthread_mutex_lock( &interlocked_mutex ); @@ -286,6 +287,7 @@ int interlocked_cmpxchg( int *dest, int xchg, int compare ) pthread_mutex_unlock( &interlocked_mutex ); return compare; } +#endif void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ) { @@ -313,6 +315,7 @@ __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ) return compare; } +#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 int interlocked_xchg( int *dest, int val ) { int retv; @@ -322,6 +325,7 @@ int interlocked_xchg( int *dest, int val ) pthread_mutex_unlock( &interlocked_mutex ); return retv; } +#endif void *interlocked_xchg_ptr( void **dest, void *val ) { @@ -333,6 +337,7 @@ void *interlocked_xchg_ptr( void **dest, void *val ) return retv; } +#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 int interlocked_xchg_add( int *dest, int incr ) { int retv; @@ -342,6 +347,7 @@ int interlocked_xchg_add( int *dest, int incr ) pthread_mutex_unlock( &interlocked_mutex ); return retv; } +#endif unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) {

1 0

Grazvydas Ignotas : port.h: Make use of compiler support for 64bit atomic ops.
by Alexandre Julliard 12 May '15

12 May '15

Module: wine Branch: master Commit: ae8408f1477837236cec3f278ed75546a20dc7e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae8408f1477837236cec3f278… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Tue May 12 03:17:36 2015 +0300 port.h: Make use of compiler support for 64bit atomic ops. --- include/wine/port.h | 12 +++++++++--- libs/port/interlocked.c | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index 16127e0..4910f34 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -367,8 +367,6 @@ extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]); #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) -extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ); - static inline int interlocked_cmpxchg( int *dest, int xchg, int compare ) { int ret; @@ -459,7 +457,6 @@ extern int interlocked_xchg( int *dest, int val ); #endif extern void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ); -extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ); extern void *interlocked_xchg_ptr( void **dest, void *val ); #if defined(__x86_64__) || defined(__aarch64__) || defined(_WIN64) extern unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, @@ -468,6 +465,15 @@ extern unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, #endif /* __GNUC__ */ +#ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 +static inline __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ) +{ + return __sync_val_compare_and_swap( dest, compare, xchg ); +} +#else +extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ); +#endif + #else /* NO_LIBWINE_PORT */ #define __WINE_NOT_PORTABLE(func) func##_is_not_portable func##_is_not_portable diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index e5b1bb9..b63c50a 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -302,6 +302,7 @@ void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ) return compare; } +#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ) { pthread_mutex_lock( &interlocked_mutex ); @@ -314,6 +315,7 @@ __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ) pthread_mutex_unlock( &interlocked_mutex ); return compare; } +#endif #ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 int interlocked_xchg( int *dest, int val )

1 0

Grazvydas Ignotas : port.h: Make use of compiler support for pointer atomic ops.
by Alexandre Julliard 12 May '15

12 May '15

Module: wine Branch: master Commit: af6066c28892dd08be650e3dcfdd84eb8954e5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6066c28892dd08be650e3dc… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Tue May 12 03:17:37 2015 +0300 port.h: Make use of compiler support for pointer atomic ops. --- include/wine/port.h | 16 ++++++++++++++++ libs/port/interlocked.c | 6 ++++++ 2 files changed, 22 insertions(+) diff --git a/include/wine/port.h b/include/wine/port.h index 4910f34..2989b39 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -456,8 +456,24 @@ extern int interlocked_xchg_add( int *dest, int incr ); extern int interlocked_xchg( int *dest, int val ); #endif +#if (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && __SIZEOF_POINTER__ == 4) \ + || (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) && __SIZEOF_POINTER__ == 8) +static inline void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ) +{ + return __sync_val_compare_and_swap( dest, compare, xchg ); +} + +static inline void *interlocked_xchg_ptr( void **dest, void *val ) +{ + void *ret; + do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); + return ret; +} +#else extern void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ); extern void *interlocked_xchg_ptr( void **dest, void *val ); +#endif + #if defined(__x86_64__) || defined(__aarch64__) || defined(_WIN64) extern unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ); diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index b63c50a..cd6201a 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -289,6 +289,8 @@ int interlocked_cmpxchg( int *dest, int xchg, int compare ) } #endif +#if !(defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && __SIZEOF_POINTER__ == 4) \ + && !(defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) && __SIZEOF_POINTER__ == 8) void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ) { pthread_mutex_lock( &interlocked_mutex ); @@ -301,6 +303,7 @@ void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ) pthread_mutex_unlock( &interlocked_mutex ); return compare; } +#endif #ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ) @@ -329,6 +332,8 @@ int interlocked_xchg( int *dest, int val ) } #endif +#if !(defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && __SIZEOF_POINTER__ == 4) \ + && !(defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8) && __SIZEOF_POINTER__ == 8) void *interlocked_xchg_ptr( void **dest, void *val ) { void *retv; @@ -338,6 +343,7 @@ void *interlocked_xchg_ptr( void **dest, void *val ) pthread_mutex_unlock( &interlocked_mutex ); return retv; } +#endif #ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 int interlocked_xchg_add( int *dest, int incr )

1 0

André Hentschel : Add WWn 390
by Jeremy Newman 11 May '15

11 May '15

Module: website Branch: master Commit: 13ca0af3c5283c101ae184b43e2068e64201f422 URL: http://source.winehq.org/git/website.git/?a=commit;h=13ca0af3c5283c101ae184… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat May 9 15:38:42 2015 +0200 Add WWn 390 --- news/de/2015050901.xml | 11 + news/en/2015050901.xml | 11 + wwn/en/wn20150509_390.xml | 654 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 676 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=13ca0af3c5283c101a…

1 0

Martin Storsjo : advapi32: Add a stub implementation of EventSetInformation.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: 518e102a7ed96274a67082d01b15d0e036d0f7b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=518e102a7ed96274a67082d01… Author: Martin Storsjo <martin(a)martin.st> Date: Sat May 9 09:06:11 2015 +0300 advapi32: Add a stub implementation of EventSetInformation. --- dlls/advapi32/advapi32.spec | 1 + dlls/advapi32/eventlog.c | 10 ++++++++++ .../api-ms-win-eventing-provider-l1-1-0.spec | 2 +- include/evntprov.h | 9 +++++++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index e7b7cf7..e885684 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -273,6 +273,7 @@ @ stdcall EventEnabled(int64 ptr) @ stdcall EventProviderEnabled(int64 long int64) @ stdcall EventRegister(ptr ptr ptr ptr) +@ stdcall EventSetInformation(int64 long ptr long) @ stdcall EventUnregister(int64) @ stdcall EventWrite(int64 ptr long ptr) # @ stub EventWriteEndScenario diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 191d817..7839fc4 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -939,6 +939,16 @@ ULONG WINAPI EventWrite( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor, ULONG } /****************************************************************************** + * EventSetInformation [ADVAPI32.@] + */ +ULONG WINAPI EventSetInformation( REGHANDLE handle, EVENT_INFO_CLASS class, PVOID info, + ULONG length ) +{ + FIXME("%u, %p, %u\n", class, info, length); + return ERROR_SUCCESS; +} + +/****************************************************************************** * QueryTraceW [ADVAPI32.@] */ ULONG WINAPI QueryTraceW( TRACEHANDLE handle, LPCWSTR sessionname, PEVENT_TRACE_PROPERTIES properties ) diff --git a/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec b/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec index a498097..82c6e69 100644 --- a/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec +++ b/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec @@ -2,7 +2,7 @@ @ stdcall EventEnabled(int64 ptr) advapi32.EventEnabled @ stdcall EventProviderEnabled(int64 long int64) advapi32.EventProviderEnabled @ stdcall EventRegister(ptr ptr ptr ptr) advapi32.EventRegister -@ stub EventSetInformation +@ stdcall EventSetInformation(int64 long ptr long) advapi32.EventSetInformation @ stdcall EventUnregister(int64) advapi32.EventUnregister @ stdcall EventWrite(int64 ptr long ptr) advapi32.EventWrite @ stub EventWriteEx diff --git a/include/evntprov.h b/include/evntprov.h index 6a3e2f3..7f086b9 100644 --- a/include/evntprov.h +++ b/include/evntprov.h @@ -59,9 +59,18 @@ typedef struct _EVENT_FILTER_DESCRIPTOR typedef VOID (NTAPI *PENABLECALLBACK)(LPCGUID,ULONG,UCHAR,ULONGLONG,ULONGLONG,PEVENT_FILTER_DESCRIPTOR,PVOID); +typedef enum _EVENT_INFO_CLASS +{ + EventProviderBinaryTrackInfo = 0, + EventProviderSetTraits, + EventProviderUseDescriptorType, + MaxEventInfo +} EVENT_INFO_CLASS; + BOOLEAN WINAPI EventEnabled(REGHANDLE, PCEVENT_DESCRIPTOR); BOOLEAN WINAPI EventProviderEnabled(REGHANDLE, UCHAR, ULONGLONG); ULONG WINAPI EventRegister(LPCGUID,PENABLECALLBACK,PVOID,PREGHANDLE); +ULONG WINAPI EventSetInformation(REGHANDLE, EVENT_INFO_CLASS, PVOID, ULONG); ULONG WINAPI EventUnregister(REGHANDLE); ULONG WINAPI EventWrite(REGHANDLE,PCEVENT_DESCRIPTOR,ULONG,PEVENT_DATA_DESCRIPTOR);

1 0

Nikolay Sivov : kernel32: Fixed couple of comments regarding atom calls.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: dde69d617bb6a9665dbf9f752c0baf7e57d26629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dde69d617bb6a9665dbf9f752… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 8 18:05:02 2015 +0300 kernel32: Fixed couple of comments regarding atom calls. --- dlls/kernel32/atom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/atom.c b/dlls/kernel32/atom.c index 5ab5c06..9682fb4 100644 --- a/dlls/kernel32/atom.c +++ b/dlls/kernel32/atom.c @@ -67,7 +67,7 @@ static RTL_ATOM_TABLE get_local_table(DWORD entries) /*********************************************************************** * InitAtomTable (KERNEL32.@) * - * Initialise the global atom table. + * Initialise local atom table. * * PARAMS * entries [I] The number of entries to reserve in the table. @@ -142,7 +142,7 @@ ATOM WINAPI GlobalAddAtomA( LPCSTR str /* [in] String to add */ ) /*********************************************************************** * AddAtomA (KERNEL32.@) * - * Add a character string to the global atom table and return a unique + * Add a character string to local atom table and return a unique * value identifying it. * * RETURNS

1 0

Nikolay Sivov : kernel32: Implement GetDynamicTimeZoneInformation().
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: 2c98d5b90cf4d1026a80a3279c8bae65cfca539c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c98d5b90cf4d1026a80a3279… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 8 17:34:10 2015 +0300 kernel32: Implement GetDynamicTimeZoneInformation(). --- dlls/kernel32/tests/time.c | 30 ++++++++++++++++++++++++++++++ dlls/kernel32/time.c | 14 ++++++++++---- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/time.c | 39 +++++++++++++++++++++++++++++++-------- include/winternl.h | 14 ++++++++++++++ 5 files changed, 86 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c98d5b90cf4d1026a80a…

1 0

Nikolay Sivov : shell32: Forward couple of IKnownFolder methods to regular API equivalents.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: 594e0b674f997af1d12bf75e67ac5c1dc723f630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=594e0b674f997af1d12bf75e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 9 13:31:34 2015 +0300 shell32: Forward couple of IKnownFolder methods to regular API equivalents. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellpath.c | 34 ++++++++++++++++++++++++++++------ include/shlobj.h | 26 +++++++++++++++++--------- 3 files changed, 46 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index f168ed7..ed34919 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -379,6 +379,7 @@ @ stdcall SHGetItemFromDataObject(ptr long ptr ptr) @ stdcall SHGetItemFromObject(ptr ptr ptr) @ stdcall SHGetKnownFolderIDList(ptr long ptr ptr) +@ stdcall SHGetKnownFolderItem(ptr long long ptr ptr) @ stdcall SHGetKnownFolderPath(ptr long ptr ptr) @ stdcall SHGetLocalizedName(wstr ptr long ptr) @ stdcall SHGetMalloc(ptr) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 354b23a..5753bb6 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -5103,12 +5103,13 @@ static HRESULT WINAPI knownfolder_GetCategory( static HRESULT WINAPI knownfolder_GetShellItem( IKnownFolder *iface, - DWORD dwFlags, + DWORD flags, REFIID riid, void **ppv) { - FIXME("0x%08x, %s, %p\n", dwFlags, debugstr_guid(riid), ppv); - return E_NOTIMPL; + struct knownfolder *knownfolder = impl_from_IKnownFolder(iface); + TRACE("(%p, 0x%08x, %s, %p)\n", knownfolder, flags, debugstr_guid(riid), ppv); + return SHGetKnownFolderItem(&knownfolder->id, flags, NULL, riid, ppv); } static HRESULT get_known_folder_path( @@ -5275,11 +5276,12 @@ static HRESULT WINAPI knownfolder_SetPath( static HRESULT WINAPI knownfolder_GetIDList( IKnownFolder *iface, - DWORD dwFlags, + DWORD flags, PIDLIST_ABSOLUTE *ppidl) { - FIXME("0x%08x, %p\n", dwFlags, ppidl); - return E_NOTIMPL; + struct knownfolder *knownfolder = impl_from_IKnownFolder( iface ); + TRACE("(%p, 0x%08x, %p)\n", knownfolder, flags, ppidl); + return SHGetKnownFolderIDList(&knownfolder->id, flags, NULL, ppidl); } static HRESULT WINAPI knownfolder_GetFolderType( @@ -5717,6 +5719,26 @@ HRESULT WINAPI SHGetKnownFolderIDList(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE return E_NOTIMPL; } +HRESULT WINAPI SHGetKnownFolderItem(REFKNOWNFOLDERID rfid, KNOWN_FOLDER_FLAG flags, HANDLE hToken, + REFIID riid, void **ppv) +{ + PIDLIST_ABSOLUTE pidl; + HRESULT hr; + + TRACE("%s, 0x%08x, %p, %s, %p\n", debugstr_guid(rfid), flags, hToken, debugstr_guid(riid), ppv); + + hr = SHGetKnownFolderIDList(rfid, flags, hToken, &pidl); + if (FAILED(hr)) + { + *ppv = NULL; + return hr; + } + + hr = SHCreateItemFromIDList(pidl, riid, ppv); + CoTaskMemFree(pidl); + return hr; +} + static void register_system_knownfolders(void) { int i; diff --git a/include/shlobj.h b/include/shlobj.h index 9025a73..c40be95 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -42,6 +42,21 @@ extern "C" { DECLARE_HANDLE(HPSXA); #endif +typedef enum +{ + KF_FLAG_DEFAULT = 0x00000000, + KF_FLAG_SIMPLE_IDLIST = 0x00000100, + KF_FLAG_NOT_PARENT_RELATIVE = 0x00000200, + KF_FLAG_DEFAULT_PATH = 0x00000400, + KF_FLAG_INIT = 0x00000800, + KF_FLAG_NO_ALIAS = 0x00001000, + KF_FLAG_DONT_UNEXPAND = 0x00002000, + KF_FLAG_DONT_VERIFY = 0x00004000, + KF_FLAG_CREATE = 0x00008000, + KF_FLAG_NO_APPCONTAINER_REDIRECTION = 0x00010000, + KF_FLAG_ALIAS_ONLY = 0x80000000 +} KNOWN_FOLDER_FLAG; + UINT WINAPI SHAddFromPropSheetExtArray(HPSXA,LPFNADDPROPSHEETPAGE,LPARAM); LPVOID WINAPI SHAlloc(ULONG) __WINE_ALLOC_SIZE(1); HRESULT WINAPI SHCoCreateInstance(LPCWSTR,const CLSID*,IUnknown*,REFIID,LPVOID*); @@ -62,6 +77,8 @@ HRESULT WINAPI SHGetInstanceExplorer(IUnknown**); HRESULT WINAPI SHGetFolderPathAndSubDirA(HWND,int,HANDLE,DWORD,LPCSTR,LPSTR); HRESULT WINAPI SHGetFolderPathAndSubDirW(HWND,int,HANDLE,DWORD,LPCWSTR,LPWSTR); #define SHGetFolderPathAndSubDir WINELIB_NAME_AW(SHGetFolderPathAndSubDir) +HRESULT WINAPI SHGetKnownFolderIDList(REFKNOWNFOLDERID,DWORD,HANDLE,PIDLIST_ABSOLUTE*); +HRESULT WINAPI SHGetKnownFolderItem(REFKNOWNFOLDERID,KNOWN_FOLDER_FLAG,HANDLE,REFIID,void**); HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID,DWORD,HANDLE,PWSTR*); BOOL WINAPI SHGetPathFromIDListA(LPCITEMIDLIST,LPSTR); BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST,LPWSTR); @@ -92,15 +109,6 @@ BOOL WINAPI Shell_GetImageLists(HIMAGELIST*,HIMAGELIST*); BOOL WINAPI SignalFileOpen(PCIDLIST_ABSOLUTE); BOOL WINAPI ImportPrivacySettings(LPCWSTR, BOOL*, BOOL*); -#define KF_FLAG_SIMPLE_IDLIST 0x00000100 -#define KF_FLAG_NOT_PARENT_RELATIVE 0x00000200 -#define KF_FLAG_DEFAULT_PATH 0x00000400 -#define KF_FLAG_INIT 0x00000800 -#define KF_FLAG_NO_ALIAS 0x00001000 -#define KF_FLAG_DONT_UNEXPAND 0x00002000 -#define KF_FLAG_DONT_VERIFY 0x00004000 -#define KF_FLAG_CREATE 0x00008000 - #define SHFMT_ERROR __MSABI_LONG(0xFFFFFFFF) /* Error on last format, drive may be formattable */ #define SHFMT_CANCEL __MSABI_LONG(0xFFFFFFFE) /* Last format was cancelled */ #define SHFMT_NOFORMAT __MSABI_LONG(0xFFFFFFFD) /* Drive is not formattable */

1 0

Nikolay Sivov : shell32: Silence IMarshal requests to IKnownFolder and IKnownFolderManager.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: 4367f4b2308d935daa76965c57d4da757403cc64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4367f4b2308d935daa76965c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 9 19:37:53 2015 +0300 shell32: Silence IMarshal requests to IKnownFolder and IKnownFolderManager. --- dlls/shell32/shellpath.c | 12 ++++++++++++ dlls/shell32/tests/shellpath.c | 8 ++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 5753bb6..331db1f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -5024,11 +5024,17 @@ static HRESULT WINAPI knownfolder_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppv ); + *ppv = NULL; if ( IsEqualGUID( riid, &IID_IKnownFolder ) || IsEqualGUID( riid, &IID_IUnknown ) ) { *ppv = iface; } + else if ( IsEqualGUID( riid, &IID_IMarshal ) ) + { + TRACE("IID_IMarshal returning NULL.\n"); + return E_NOINTERFACE; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); @@ -5416,11 +5422,17 @@ static HRESULT WINAPI foldermanager_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppv ); + *ppv = NULL; if ( IsEqualGUID( riid, &IID_IKnownFolderManager ) || IsEqualGUID( riid, &IID_IUnknown ) ) { *ppv = iface; } + else if ( IsEqualGUID( riid, &IID_IMarshal ) ) + { + TRACE("IID_IMarshal returning NULL.\n"); + return E_NOINTERFACE; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index c2ce198..ec21ce7 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -2075,8 +2075,13 @@ static void test_knownFolders(void) win_skip("IKnownFolderManager unavailable\n"); else { + IUnknown *unk; + ok(hr == S_OK, "failed to create KnownFolderManager instance: 0x%08x\n", hr); + hr = IKnownFolderManager_QueryInterface(mgr, &IID_IMarshal, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + hr = IKnownFolderManager_FolderIdFromCsidl(mgr, CSIDL_WINDOWS, &folderId); ok(hr == S_OK, "failed to convert CSIDL to KNOWNFOLDERID: 0x%08x\n", hr); ok(IsEqualGUID(&folderId, &FOLDERID_Windows)==TRUE, "invalid KNOWNFOLDERID returned\n"); @@ -2089,6 +2094,9 @@ static void test_knownFolders(void) ok(hr == S_OK, "failed to get known folder: 0x%08x\n", hr); if(SUCCEEDED(hr)) { + hr = IKnownFolder_QueryInterface(folder, &IID_IMarshal, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + hr = IKnownFolder_GetCategory(folder, &cat); ok(hr == S_OK, "failed to get folder category: 0x%08x\n", hr); ok(cat==KF_CATEGORY_FIXED, "invalid folder category: %d\n", cat);

1 0

Nikolay Sivov : shell32: Partially implement SHGetKnownFolderIDList().
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: 80d28abdc8cadb6dc5e35c36c2d9f71eddff50f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d28abdc8cadb6dc5e35c36c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 9 21:46:56 2015 +0300 shell32: Partially implement SHGetKnownFolderIDList(). --- dlls/shell32/shellpath.c | 44 ++++++++++++++++++++++++++++++++++++++++-- dlls/shell32/tests/shellpath.c | 35 +++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 331db1f..42f34a2 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -5727,8 +5727,48 @@ HRESULT WINAPI KnownFolderManager_Constructor( IUnknown *punk, REFIID riid, void HRESULT WINAPI SHGetKnownFolderIDList(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE token, PIDLIST_ABSOLUTE *pidl) { - FIXME("%s, 0x%08x, %p, %p\n", debugstr_guid(rfid), flags, token, pidl); - return E_NOTIMPL; + TRACE("%s, 0x%08x, %p, %p\n", debugstr_guid(rfid), flags, token, pidl); + + if (!pidl) + return E_INVALIDARG; + + if (flags) + FIXME("unsupported flags: 0x%08x\n", flags); + + if (token) + FIXME("user token is not used.\n"); + + *pidl = NULL; + if (IsEqualIID(rfid, &FOLDERID_Desktop)) + *pidl = _ILCreateDesktop(); + else if (IsEqualIID(rfid, &FOLDERID_RecycleBinFolder)) + *pidl = _ILCreateBitBucket(); + else if (IsEqualIID(rfid, &FOLDERID_ComputerFolder)) + *pidl = _ILCreateMyComputer(); + else if (IsEqualIID(rfid, &FOLDERID_PrintersFolder)) + *pidl = _ILCreatePrinters(); + else if (IsEqualIID(rfid, &FOLDERID_ControlPanelFolder)) + *pidl = _ILCreateControlPanel(); + else if (IsEqualIID(rfid, &FOLDERID_NetworkFolder)) + *pidl = _ILCreateNetwork(); + else if (IsEqualIID(rfid, &FOLDERID_Documents)) + *pidl = _ILCreateMyDocuments(); + else + { + DWORD attributes = 0; + WCHAR *pathW; + HRESULT hr; + + hr = SHGetKnownFolderPath(rfid, flags, token, &pathW); + if (FAILED(hr)) + return hr; + + hr = SHILCreateFromPathW(pathW, pidl, &attributes); + CoTaskMemFree(pathW); + return hr; + } + + return *pidl ? S_OK : E_FAIL; } HRESULT WINAPI SHGetKnownFolderItem(REFKNOWNFOLDERID rfid, KNOWN_FOLDER_FLAG flags, HANDLE hToken, diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index ec21ce7..6b5ed76 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -102,6 +102,7 @@ static HRESULT (WINAPI *pSHGetKnownFolderPath)(REFKNOWNFOLDERID, DWORD, HANDLE, static HRESULT (WINAPI *pSHSetKnownFolderPath)(REFKNOWNFOLDERID, DWORD, HANDLE, PWSTR); static HRESULT (WINAPI *pSHGetFolderPathEx)(REFKNOWNFOLDERID, DWORD, HANDLE, LPWSTR, DWORD); static BOOL (WINAPI *pPathYetAnotherMakeUniqueName)(PWSTR, PCWSTR, PCWSTR, PCWSTR); +static HRESULT (WINAPI *pSHGetKnownFolderIDList)(REFKNOWNFOLDERID, DWORD, HANDLE, PIDLIST_ABSOLUTE*); static DLLVERSIONINFO shellVersion = { 0 }; static LPMALLOC pMalloc; @@ -209,6 +210,7 @@ static void loadShell32(void) GET_PROC(SHFileOperationA) GET_PROC(SHGetMalloc) GET_PROC(PathYetAnotherMakeUniqueName) + GET_PROC(SHGetKnownFolderIDList) ok(pSHGetMalloc != NULL, "shell32 is missing SHGetMalloc\n"); if (pSHGetMalloc) @@ -2728,6 +2730,38 @@ if (0) ok(!lstrcmpW(nameW, buffW), "got %s, expected %s\n", wine_dbgstr_w(nameW), wine_dbgstr_w(buffW)); } +static void test_SHGetKnownFolderIDList(void) +{ + PIDLIST_ABSOLUTE pidl; + HRESULT hr; + + if (!pSHGetKnownFolderIDList) + { + win_skip("SHGetKnownFolderIDList is not available.\n"); + return; + } + + hr = pSHGetKnownFolderIDList(NULL, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + +if (0) { /* crashes on native */ + pidl = (void*)0xdeadbeef; + hr = pSHGetKnownFolderIDList(NULL, 0, NULL, &pidl); +} + /* not a known folder */ + pidl = (void*)0xdeadbeef; + hr = pSHGetKnownFolderIDList(&IID_IUnknown, 0, NULL, &pidl); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + ok(pidl == NULL, "got %p\n", pidl); + + hr = pSHGetKnownFolderIDList(&FOLDERID_Desktop, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = pSHGetKnownFolderIDList(&FOLDERID_Desktop, 0, NULL, &pidl); + ok(hr == S_OK, "got 0x%08x\n", hr); + CoTaskMemFree(pidl); +} + START_TEST(shellpath) { if (!init()) return; @@ -2757,5 +2791,6 @@ START_TEST(shellpath) test_knownFolders(); test_DoEnvironmentSubst(); test_PathYetAnotherMakeUniqueName(); + test_SHGetKnownFolderIDList(); } }

1 0