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

Mark Harmstone : kernel32: Add GetFileMUIInfo stub.
by Alexandre Julliard May 12, 2015

May 12, 2015

Module: wine Branch: master Commit: e468f15d20f4bb6ce6996458e022bb502ef3e8ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e468f15d20f4bb6ce6996458e… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Mon May 11 22:30:57 2015 +0100 kernel32: Add GetFileMUIInfo stub. --- .../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 | 12 ++++++++++++ include/winnls.h | 17 +++++++++++++++++ 5 files changed, 32 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 d5daa65..60da5fe 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 @@ -11,7 +11,7 @@ @ stdcall GetCPInfoExW(long long ptr) kernel32.GetCPInfoExW @ stdcall GetCalendarInfoEx(wstr long ptr long ptr long ptr) kernel32.GetCalendarInfoEx @ stdcall GetCalendarInfoW(long long long ptr long ptr) kernel32.GetCalendarInfoW -@ stub GetFileMUIInfo +@ stdcall GetFileMUIInfo(long wstr ptr ptr) kernel32.GetFileMUIInfo @ 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 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 50e113e..3a29cb7 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 @@ -12,7 +12,7 @@ @ stdcall GetCPInfoExW(long long ptr) kernel32.GetCPInfoExW @ stdcall GetCalendarInfoEx(wstr long ptr long ptr long ptr) kernel32.GetCalendarInfoEx @ stdcall GetCalendarInfoW(long long long ptr long ptr) kernel32.GetCalendarInfoW -@ stub GetFileMUIInfo +@ stdcall GetFileMUIInfo(long wstr ptr ptr) kernel32.GetFileMUIInfo @ 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 diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index bb72041..0809761 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -676,7 +676,7 @@ # @ stub GetFileBandwidthReservation @ stdcall GetFileInformationByHandle(long ptr) @ stdcall GetFileInformationByHandleEx(long long ptr long) -# @ stub GetFileMUIInfo +@ stdcall GetFileMUIInfo(long wstr ptr ptr) @ stdcall GetFileMUIPath(long wstr wstr ptr ptr ptr ptr) @ stdcall GetFileSize(long ptr) @ stdcall GetFileSizeEx(long ptr) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 9896872..bcdcdba 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -5315,3 +5315,15 @@ BOOL WINAPI GetFileMUIPath(DWORD flags, PCWSTR filepath, PWSTR language, PULONG return FALSE; } + +/****************************************************************************** + * GetFileMUIInfo (KERNEL32.@) + */ + +BOOL WINAPI GetFileMUIInfo(DWORD flags, PCWSTR path, FILEMUIINFO *info, DWORD *size) +{ + FIXME("stub: %u, %s, %p, %p\n", flags, debugstr_w(path), info, size); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/include/winnls.h b/include/winnls.h index b1ce0cd..7e9bfa5 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -604,6 +604,22 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define MUI_LANGUAGE_INSTALLED 0x20 #define MUI_LANGUAGE_LICENSED 0x40 +typedef struct _FILEMUIINFO { + DWORD dwSize; + DWORD dwVersion; + DWORD dwFileType; + BYTE pChecksum[16]; + BYTE pServiceChecksum[16]; + DWORD dwLanguageNameOffset; + DWORD dwTypeIDMainSize; + DWORD dwTypeIDMainOffset; + DWORD dwTypeNameMainOffset; + DWORD dwTypeIDMUISize; + DWORD dwTypeIDMUIOffset; + DWORD dwTypeNameMUIOffset; + BYTE abBuffer[8]; +} FILEMUIINFO, *PFILEMUIINFO; + /* Types */ @@ -860,6 +876,7 @@ WINBASEAPI INT WINAPI GetDateFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR WINBASEAPI INT WINAPI GetDateFormatEx(LPCWSTR,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT,LPCWSTR); WINBASEAPI INT WINAPI GetDateFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT); #define GetDateFormat WINELIB_NAME_AW(GetDateFormat) +WINBASEAPI BOOL WINAPI GetFileMUIInfo(DWORD,PCWSTR,PFILEMUIINFO,DWORD*); WINBASEAPI INT WINAPI GetGeoInfoA(GEOID,GEOTYPE,LPSTR,INT,LANGID); WINBASEAPI INT WINAPI GetGeoInfoW(GEOID,GEOTYPE,LPWSTR,INT,LANGID); #define GetGeoInfo WINELIB_NAME_AW(GetGeoInfo)

1 0

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

May 12, 2015

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

Mark Harmstone : uxtheme: Stub out buffered animation functions.
by Alexandre Julliard May 12, 2015

May 12, 2015

Module: wine Branch: master Commit: a88722ab9a0b6eb69b5bf3e0da82b74d0a564e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a88722ab9a0b6eb69b5bf3e0d… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Mon May 11 23:36:41 2015 +0100 uxtheme: Stub out buffered animation functions. --- dlls/uxtheme/buffer.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/uxtheme/uxtheme.spec | 4 ++++ 2 files changed, 48 insertions(+) diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index 8955a0d..8583f1a 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -136,3 +136,47 @@ HRESULT WINAPI GetBufferedPaintTargetRect(HPAINTBUFFER hBufferedPaint, RECT *prc FIXME("Stub (%p %p)\n", hBufferedPaint, prc); return E_NOTIMPL; } + +/*********************************************************************** + * BeginBufferedAnimation (UXTHEME.@) + */ +HANIMATIONBUFFER WINAPI BeginBufferedAnimation(HWND hwnd, HDC hdcTarget, const RECT *rcTarget, + BP_BUFFERFORMAT dwFormat, BP_PAINTPARAMS *pPaintParams, + BP_ANIMATIONPARAMS *pAnimationParams, HDC *phdcFrom, + HDC *phdcTo) +{ + FIXME("Stub (%p %p %p %u %p %p %p %p)\n", hwnd, hdcTarget, rcTarget, dwFormat, + pPaintParams, pAnimationParams, phdcFrom, phdcTo); + + return NULL; +} + +/*********************************************************************** + * BufferedPaintRenderAnimation (UXTHEME.@) + */ +BOOL WINAPI BufferedPaintRenderAnimation(HWND hwnd, HDC hdcTarget) +{ + FIXME("Stub (%p %p)\n", hwnd, hdcTarget); + + return FALSE; +} + +/*********************************************************************** + * BufferedPaintStopAllAnimations (UXTHEME.@) + */ +HRESULT WINAPI BufferedPaintStopAllAnimations(HWND hwnd) +{ + FIXME("Stub (%p)\n", hwnd); + + return E_NOTIMPL; +} + +/*********************************************************************** + * EndBufferedAnimation (UXTHEME.@) + */ +HRESULT WINAPI EndBufferedAnimation(HANIMATIONBUFFER hbpAnimation, BOOL fUpdateTarget) +{ + FIXME("Stub (%p %u)\n", hbpAnimation, fUpdateTarget); + + return E_NOTIMPL; +} diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index 3f8e89a..7a0e7e4 100644 --- a/dlls/uxtheme/uxtheme.spec +++ b/dlls/uxtheme/uxtheme.spec @@ -43,10 +43,13 @@ 63 stub -noname MarkSelection # Standard functions +@ stdcall BeginBufferedAnimation(ptr ptr ptr long ptr ptr ptr ptr) @ stdcall BeginBufferedPaint(ptr ptr long ptr ptr) @ stdcall BufferedPaintClear(ptr ptr) @ stdcall BufferedPaintInit() +@ stdcall BufferedPaintRenderAnimation(ptr ptr) @ stdcall BufferedPaintSetAlpha(ptr ptr long) +@ stdcall BufferedPaintStopAllAnimations(ptr) @ stdcall BufferedPaintUnInit() @ stdcall CloseThemeData(ptr) @ stdcall DrawThemeBackground(ptr ptr long long ptr ptr) @@ -57,6 +60,7 @@ @ stdcall DrawThemeText(ptr ptr long long wstr long long long ptr) @ stdcall EnableThemeDialogTexture(ptr long) @ stdcall EnableTheming(long) +@ stdcall EndBufferedAnimation(ptr long) @ stdcall EndBufferedPaint(ptr long) @ stdcall GetBufferedPaintBits(ptr ptr ptr) @ stdcall GetBufferedPaintDC(ptr)

1 0

André Hentschel : Add WWn 390
by Jeremy Newman May 11, 2015

May 11, 2015

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

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard May 11, 2015

May 11, 2015

Module: wine Branch: master Commit: 6d323d81b2a604b89c612928a573b290c945df75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d323d81b2a604b89c612928a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 11 13:41:39 2015 +0300 po: Update Russian translation. --- po/ru.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/ru.po b/po/ru.po index 988679c..7c80b4a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8546,7 +8546,7 @@ msgstr "По&вторить" #: user32.rc:88 msgid "&Continue" -msgstr "П&роложить" +msgstr "П&родолжить" #: user32.rc:94 msgid "Select Window" @@ -8565,10 +8565,8 @@ msgid "Duplex:" msgstr "Двухсторонняя печать:" #: wineps.rc:50 -#, fuzzy -#| msgid "&Setup" msgid "Setup" -msgstr "Сво&йства" +msgstr "Настройка" #: wininet.rc:42 wininet.rc:62 msgid "Realm"

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard May 11, 2015

May 11, 2015

Module: wine Branch: master Commit: 4894bfcc068ccf26e72132e7a1a4e433fb2d0c12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4894bfcc068ccf26e72132e7a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu May 7 23:56:09 2015 -0600 po: Update Catalan translation. --- po/ca.po | 4818 ++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 2334 insertions(+), 2484 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4894bfcc068ccf26e7213…

1 0

Nikolay Sivov : shell32: Implement ParseName().
by Alexandre Julliard May 11, 2015

May 11, 2015

Module: wine Branch: master Commit: e013a7e584863abb3d9bc5ce1339830b6560aba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e013a7e584863abb3d9bc5ce1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 10 20:00:55 2015 +0300 shell32: Implement ParseName(). --- dlls/shell32/shelldispatch.c | 38 +++++++++++++++++++--- dlls/shell32/tests/shelldispatch.c | 65 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index f168477..6e13123 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -460,6 +460,8 @@ static HRESULT FolderItem_Constructor(VARIANT *dir, FolderItem **ppfi) FolderItemImpl *This; HRESULT ret; + TRACE("%s\n", debugstr_variant(dir)); + *ppfi = NULL; This = HeapAlloc(GetProcessHeap(), 0, sizeof(FolderItemImpl)); @@ -637,13 +639,39 @@ static HRESULT WINAPI FolderImpl_Items(Folder3 *iface, FolderItems **ppid) return E_NOTIMPL; } -static HRESULT WINAPI FolderImpl_ParseName(Folder3 *iface, BSTR bName, - FolderItem **ppid) +static HRESULT WINAPI FolderImpl_ParseName(Folder3 *iface, BSTR name, FolderItem **item) { - FIXME("(%p,%s,%p)\n", iface, debugstr_w(bName), ppid); + FolderItem *self; + BSTR str; + WCHAR pathW[MAX_PATH]; + VARIANT v; + HRESULT hr; - *ppid = NULL; - return E_NOTIMPL; + TRACE("(%p,%s,%p)\n", iface, debugstr_w(name), item); + + *item = NULL; + + if (!name || !name[0]) + return S_FALSE; + + hr = Folder3_get_Self(iface, &self); + if (FAILED(hr)) + return hr; + + hr = FolderItem_get_Path(self, &str); + FolderItem_Release(self); + + PathCombineW(pathW, str, name); + SysFreeString(str); + + if (!PathFileExistsW(pathW)) + return S_FALSE; + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(pathW); + hr = FolderItem_Constructor(&v, item); + VariantClear(&v); + return hr; } static HRESULT WINAPI FolderImpl_NewFolder(Folder3 *iface, BSTR bName, diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index fe25eb4..851d775 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -679,6 +679,70 @@ todo_wine IShellWindows_Release(shellwindows); } +static void test_ParseName(void) +{ + static const WCHAR cadabraW[] = {'c','a','d','a','b','r','a',0}; + WCHAR pathW[MAX_PATH]; + IShellDispatch *sd; + FolderItem *item; + Folder *folder; + HRESULT hr; + VARIANT v; + BSTR str; + + hr = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellDispatch, (void**)&sd); + ok(hr == S_OK, "got 0x%08x\n", hr); + + GetTempPathW(sizeof(pathW)/sizeof(pathW[0]), pathW); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(pathW); + hr = IShellDispatch_NameSpace(sd, v, &folder); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&v); + + item = (void*)0xdeadbeef; + hr = Folder_ParseName(folder, NULL, &item); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(item == NULL, "got %p\n", item); + + /* empty name */ + str = SysAllocStringLen(NULL, 0); + item = (void*)0xdeadbeef; + hr = Folder_ParseName(folder, str, &item); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(item == NULL, "got %p\n", item); + SysFreeString(str); + + /* path doesn't exist */ + str = SysAllocString(cadabraW); + item = (void*)0xdeadbeef; + hr = Folder_ParseName(folder, str, &item); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(item == NULL, "got %p\n", item); + SysFreeString(str); + + lstrcatW(pathW, cadabraW); + CreateDirectoryW(pathW, NULL); + + str = SysAllocString(cadabraW); + item = NULL; + hr = Folder_ParseName(folder, str, &item); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(item != NULL, "got %p\n", item); + SysFreeString(str); + + hr = FolderItem_get_Path(item, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(str[0] != 0, "path %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + RemoveDirectoryW(pathW); + FolderItem_Release(item); + Folder_Release(folder); + IShellDispatch_Release(sd); +} + START_TEST(shelldispatch) { HRESULT r; @@ -693,6 +757,7 @@ START_TEST(shelldispatch) test_service(); test_ShellFolderViewDual(); test_ShellWindows(); + test_ParseName(); CoUninitialize(); }

1 0

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

May 11, 2015

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 : kernel32: Fixed couple of comments regarding atom calls.
by Alexandre Julliard May 11, 2015

May 11, 2015

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

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

May 11, 2015

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