April 2018 - Wine-devel - list.winehq.org

[PATCH 1/2] comctl32/button: Implement BCM_{GET,SET}IMAGELIST message.
by Zhiyi Zhang 04 Apr '18

04 Apr '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 42 +++++++++++++++------- dlls/comctl32/tests/button.c | 86 ++++++++++++++++++++++++++++++++++++++++++++ include/commctrl.h | 4 +++ 3 files changed, 119 insertions(+), 13 deletions(-)

2 1

[PATCH v2 1/5] ole32: Add support for loading enhmetafiles from presentation and contents streams to data cache.
by Sergio Gómez Del Real 04 Apr '18

04 Apr '18

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/ole32/datacache.c | 185 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 122 insertions(+), 63 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 325a98b33b..799e14a867 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -459,6 +459,45 @@ static void DataCache_FireOnViewChange( } } +/* helper for copying STGMEDIUM of type bitmap, MF, EMF or HGLOBAL. +* does no checking of whether src_stgm has a supported tymed, so this should be +* done in the caller */ +static HRESULT copy_stg_medium(CLIPFORMAT cf, STGMEDIUM *dest_stgm, + const STGMEDIUM *src_stgm) +{ + if (src_stgm->tymed == TYMED_MFPICT) + { + const METAFILEPICT *src_mfpict = GlobalLock(src_stgm->u.hMetaFilePict); + METAFILEPICT *dest_mfpict; + + if (!src_mfpict) + return DV_E_STGMEDIUM; + dest_stgm->u.hMetaFilePict = GlobalAlloc(GMEM_MOVEABLE, sizeof(METAFILEPICT)); + dest_mfpict = GlobalLock(dest_stgm->u.hMetaFilePict); + if (!dest_mfpict) + { + GlobalUnlock(src_stgm->u.hMetaFilePict); + return E_OUTOFMEMORY; + } + *dest_mfpict = *src_mfpict; + dest_mfpict->hMF = CopyMetaFileW(src_mfpict->hMF, NULL); + GlobalUnlock(src_stgm->u.hMetaFilePict); + GlobalUnlock(dest_stgm->u.hMetaFilePict); + } + else if (src_stgm->tymed != TYMED_NULL) + { + dest_stgm->u.hGlobal = OleDuplicateData(src_stgm->u.hGlobal, cf, + GMEM_MOVEABLE); + if (!dest_stgm->u.hGlobal) + return E_OUTOFMEMORY; + } + dest_stgm->tymed = src_stgm->tymed; + dest_stgm->pUnkForRelease = src_stgm->pUnkForRelease; + if (dest_stgm->pUnkForRelease) + IUnknown_AddRef(dest_stgm->pUnkForRelease); + return S_OK; +} + static HRESULT read_clipformat(IStream *stream, CLIPFORMAT *clipformat) { DWORD length; @@ -547,6 +586,30 @@ static HRESULT open_pres_stream( IStorage *stg, int stream_number, IStream **stm return IStorage_OpenStream( stg, name, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, stm ); } +static HRESULT synthesize_emf( HMETAFILEPICT data, STGMEDIUM *med ) +{ + METAFILEPICT *pict; + HRESULT hr = E_FAIL; + UINT size; + void *bits; + + if (!(pict = GlobalLock( data ))) return hr; + + size = GetMetaFileBitsEx( pict->hMF, 0, NULL ); + if ((bits = HeapAlloc( GetProcessHeap(), 0, size ))) + { + GetMetaFileBitsEx( pict->hMF, size, bits ); + med->u.hEnhMetaFile = SetWinMetaFileBits( size, bits, NULL, pict ); + HeapFree( GetProcessHeap(), 0, bits ); + med->tymed = TYMED_ENHMF; + med->pUnkForRelease = NULL; + hr = S_OK; + } + + GlobalUnlock( data ); + return hr; +} + static HRESULT load_mf_pict( DataCacheEntry *cache_entry, IStream *stm ) { HRESULT hr; @@ -701,7 +764,62 @@ fail: GlobalUnlock( hglobal ); GlobalFree( hglobal ); return E_FAIL; +} +static HRESULT load_emf( DataCacheEntry *cache_entry, IStream *stm ) +{ + HRESULT hr; + + if (cache_entry->load_stream_num != STREAM_NUMBER_CONTENTS) + { + STGMEDIUM stgmed; + + hr = load_mf_pict( cache_entry, stm ); + if (SUCCEEDED( hr )) + hr = synthesize_emf( cache_entry->stgmedium.u.hMetaFilePict, &stgmed ); + if (SUCCEEDED( hr )) + { + ReleaseStgMedium( &cache_entry->stgmedium ); + hr = copy_stg_medium( CF_ENHMETAFILE, &cache_entry->stgmedium, &stgmed ); + ReleaseStgMedium( &stgmed ); + } + } + else + { + STATSTG stat; + void *data; + DWORD size_bits; + ULONG read; + + hr = IStream_Stat( stm, &stat, STATFLAG_NONAME ); + + if (SUCCEEDED( hr )) + { + data = HeapAlloc( GetProcessHeap(), 0, stat.cbSize.u.LowPart ); + if (!data) return E_OUTOFMEMORY; + + hr = IStream_Read( stm, data, stat.cbSize.u.LowPart, &read ); + if (hr != S_OK || read != stat.cbSize.u.LowPart) + { + HeapFree( GetProcessHeap(), 0, data ); + return E_FAIL; + } + + size_bits = read - sizeof(DWORD) - sizeof(ENHMETAHEADER); + if (size_bits <= 0) + { + HeapFree( GetProcessHeap(), 0, data ); + return E_FAIL; + } + cache_entry->stgmedium.u.hEnhMetaFile = SetEnhMetaFileBits( size_bits, (BYTE *)data + (read - size_bits) ); + cache_entry->stgmedium.tymed = TYMED_ENHMF; + cache_entry->stgmedium.pUnkForRelease = NULL; + + HeapFree( GetProcessHeap(), 0, data ); + } + } + + return hr; } /************************************************************************ @@ -736,6 +854,10 @@ static HRESULT DataCacheEntry_LoadData(DataCacheEntry *cache_entry, IStorage *st hr = load_dib( cache_entry, stm ); break; + case CF_ENHMETAFILE: + hr = load_emf( cache_entry, stm ); + break; + default: FIXME( "Unimplemented clip format %x\n", cache_entry->fmtetc.cfFormat ); hr = E_NOTIMPL; @@ -1030,45 +1152,6 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag return hr; } -/* helper for copying STGMEDIUM of type bitmap, MF, EMF or HGLOBAL. -* does no checking of whether src_stgm has a supported tymed, so this should be -* done in the caller */ -static HRESULT copy_stg_medium(CLIPFORMAT cf, STGMEDIUM *dest_stgm, - const STGMEDIUM *src_stgm) -{ - if (src_stgm->tymed == TYMED_MFPICT) - { - const METAFILEPICT *src_mfpict = GlobalLock(src_stgm->u.hMetaFilePict); - METAFILEPICT *dest_mfpict; - - if (!src_mfpict) - return DV_E_STGMEDIUM; - dest_stgm->u.hMetaFilePict = GlobalAlloc(GMEM_MOVEABLE, sizeof(METAFILEPICT)); - dest_mfpict = GlobalLock(dest_stgm->u.hMetaFilePict); - if (!dest_mfpict) - { - GlobalUnlock(src_stgm->u.hMetaFilePict); - return E_OUTOFMEMORY; - } - *dest_mfpict = *src_mfpict; - dest_mfpict->hMF = CopyMetaFileW(src_mfpict->hMF, NULL); - GlobalUnlock(src_stgm->u.hMetaFilePict); - GlobalUnlock(dest_stgm->u.hMetaFilePict); - } - else if (src_stgm->tymed != TYMED_NULL) - { - dest_stgm->u.hGlobal = OleDuplicateData(src_stgm->u.hGlobal, cf, - GMEM_MOVEABLE); - if (!dest_stgm->u.hGlobal) - return E_OUTOFMEMORY; - } - dest_stgm->tymed = src_stgm->tymed; - dest_stgm->pUnkForRelease = src_stgm->pUnkForRelease; - if (dest_stgm->pUnkForRelease) - IUnknown_AddRef(dest_stgm->pUnkForRelease); - return S_OK; -} - static HRESULT synthesize_dib( HBITMAP bm, STGMEDIUM *med ) { HDC hdc = GetDC( 0 ); @@ -1118,30 +1201,6 @@ static HRESULT synthesize_bitmap( HGLOBAL dib, STGMEDIUM *med ) return hr; } -static HRESULT synthesize_emf( HMETAFILEPICT data, STGMEDIUM *med ) -{ - METAFILEPICT *pict; - HRESULT hr = E_FAIL; - UINT size; - void *bits; - - if (!(pict = GlobalLock( data ))) return hr; - - size = GetMetaFileBitsEx( pict->hMF, 0, NULL ); - if ((bits = HeapAlloc( GetProcessHeap(), 0, size ))) - { - GetMetaFileBitsEx( pict->hMF, size, bits ); - med->u.hEnhMetaFile = SetWinMetaFileBits( size, bits, NULL, pict ); - HeapFree( GetProcessHeap(), 0, bits ); - med->tymed = TYMED_ENHMF; - med->pUnkForRelease = NULL; - hr = S_OK; - } - - GlobalUnlock( data ); - return hr; -} - static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, const FORMATETC *formatetc, STGMEDIUM *stgmedium, -- 2.14.1

2 11

[PATCH] comctl32: Use heap_alloc() instead of heap_realloc()
by Dan Bassi 04 Apr '18

04 Apr '18

1 0

[PATCH website] Update the mailing list traffic estimations
by Michael Stefaniuc 03 Apr '18

03 Apr '18

Also deprecate wine-patches in the English version of that page. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- templates/en/forums.template | 8 ++++---- templates/fr/forums.template | 6 +++--- templates/ko/forums.template | 6 +++--- templates/pl/forums.template | 6 +++--- templates/pt/forums.template | 6 +++--- templates/tr/forums.template | 6 +++--- templates/zh-cn/forums.template | 6 +++--- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index f21dad47..6d5d0133 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -66,7 +66,7 @@ mailing list software. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.devel">via newsreader</a>] <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> - A medium traffic (25/day) open list for discussing Wine development, + A medium traffic (50/day) open list for discussing Wine development, WineHQ, patches or anything else of interest to Wine developers. </li> @@ -76,7 +76,7 @@ mailing list software. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - A medium traffic (45/day) open list for submitting patches only. + A deprecated list for submitting patches. Use instead <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a>. </li> <li> @@ -85,7 +85,7 @@ mailing list software. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">via newsreader</a>] <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> - A medium traffic (35/day) read only list which tracks commits to the Git + A medium traffic (25/day) read only list which tracks commits to the Git tree. </li> @@ -111,7 +111,7 @@ mailing list software. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">via newsreader</a>] <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> - A high traffic (150/day) read-only list for monitoring activity on the + A high traffic (100/day) read-only list for monitoring activity on the <a href="//bugs.winehq.org/">Bug Tracking Database</a>. </li> diff --git a/templates/fr/forums.template b/templates/fr/forums.template index e82b6c6c..6a70658c 100644 --- a/templates/fr/forums.template +++ b/templates/fr/forums.template @@ -50,7 +50,7 @@ le mot de passe obtenu lors de l'inscription, ou employez simplement <a href="// [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.devel">via un lecteur de nouvelles</a>] <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> - Une liste moyen trafic (25 messages par jour) pour la discussion sur le développement de Wine, les patchs ou tout autre élément intéressant pour les développeurs Wine. + Une liste moyen trafic (50 messages par jour) pour la discussion sur le développement de Wine, les patchs ou tout autre élément intéressant pour les développeurs Wine. </li> <li> @@ -68,7 +68,7 @@ le mot de passe obtenu lors de l'inscription, ou employez simplement <a href="// [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">via un lecteur de nouvelles</a>] <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> - Une liste moyen trafic (35 messages par jour) en lecture seule pour le suivi des commits dans Git. + Une liste moyen trafic (25 messages par jour) en lecture seule pour le suivi des commits dans Git. </li> <li> @@ -91,7 +91,7 @@ le mot de passe obtenu lors de l'inscription, ou employez simplement <a href="// [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">via un lecteur de nouvelles</a>] <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> - Une liste haut trafic (150 messages par jour) en lecture seule pour la surveillances des activités sur la + Une liste haut trafic (100 messages par jour) en lecture seule pour la surveillances des activités sur la <a href="//bugs.winehq.org/">base de données de suivi de bogues</a>. </li> diff --git a/templates/ko/forums.template b/templates/ko/forums.template index 416a9d93..496fdaea 100644 --- a/templates/ko/forums.template +++ b/templates/ko/forums.template @@ -58,7 +58,7 @@ WWW</a>를 통해 구독하거나, 목록 이름-request(a)winehq.org로 " [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">보존 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.devel">소식 읽기를 통해</a>] <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> - 중간 용량 (하루에 25편) 와인 개발, + 중간 용량 (하루에 50편) 와인 개발, 와인HQ, 깃기, 기타 개발자가 알아야 할 내용에 관한 공개 토론 목록입니다. </li> @@ -77,7 +77,7 @@ WWW</a>를 통해 구독하거나, 목록 이름-request(a)winehq.org로 " [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">보존 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">소식 읽기를 통해</a>] <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> - 중간 용량 (하루에 35편) 깃 나무의 기우기를 추적하는 읽기 전용 목록입니다. + 중간 용량 (하루에 25편) 깃 나무의 기우기를 추적하는 읽기 전용 목록입니다. </li> <li> @@ -100,7 +100,7 @@ WWW</a>를 통해 구독하거나, 목록 이름-request(a)winehq.org로 " [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">보존 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">소식 읽기를 통해</a>] <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> - 대용량 (하루에 150편) <a href="//bugs.winehq.org/">오류 추적 정보기지</a>를 관리하는 읽기 전용 목록입니다.. + 대용량 (하루에 100편) <a href="//bugs.winehq.org/">오류 추적 정보기지</a>를 관리하는 읽기 전용 목록입니다.. </li> <li> diff --git a/templates/pl/forums.template b/templates/pl/forums.template index e260341e..e8b72926 100644 --- a/templates/pl/forums.template +++ b/templates/pl/forums.template @@ -56,7 +56,7 @@ oprogramowanie listy mailingowej. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">Archiwum 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.devel">przez czytnik aktualności</a>] <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> - Średni ruch (25/dziennie) otwarta lista dla dyskusji nt. tworzenia Wine, + Średni ruch (50/dziennie) otwarta lista dla dyskusji nt. tworzenia Wine, WineHQ, łatek lub czegokolwiek innego leżącego w zakresie interesu programistów Wine. <li> @@ -73,7 +73,7 @@ oprogramowanie listy mailingowej. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archiwum 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">przez czytnik aktualności</a>] <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> - Średni ruch (35/dziennie) lista tylko-do-odczytu, która śledzi zatwierdzenia do drzewa Git. + Średni ruch (25/dziennie) lista tylko-do-odczytu, która śledzi zatwierdzenia do drzewa Git. <li> [<a href="//www.winehq.org/mailman/listinfo/wine-releases">(Wy-/Za-)pisz</a>] @@ -95,7 +95,7 @@ oprogramowanie listy mailingowej. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">Archiwum 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">przez czytnik aktualności</a>] <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> - Wysoki ruch (150/dziennie) lista tylko-do-odczytu do monitorowania aktywności + Wysoki ruch (100/dziennie) lista tylko-do-odczytu do monitorowania aktywności <a href="//bugs.winehq.org/">bazy danych śledzącej błędy</a>. <li> diff --git a/templates/pt/forums.template b/templates/pt/forums.template index f109f506..72d86244 100644 --- a/templates/pt/forums.template +++ b/templates/pt/forums.template @@ -58,7 +58,7 @@ do contrário o seu email será tratado como um possível spam pelo software da [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">Arquivo 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.devel">via newsreader</a>] <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> - Uma lista aberta de tráfego médio (25/dia) para discutir desenvolvimento do Wine, + Uma lista aberta de tráfego médio (50/dia) para discutir desenvolvimento do Wine, WineHQ, patches e qualquer outra coisa de interesse a desenvolvedores do Wine. <li> @@ -75,7 +75,7 @@ do contrário o seu email será tratado como um possível spam pelo software da [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Arquivo 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">via newsreader</a>] <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> - Uma lista aberta de tráfego médio (35/dia) de somente leitura que lista os commits feitas + Uma lista aberta de tráfego médio (25/dia) de somente leitura que lista os commits feitas na árvore Git. <li> @@ -98,7 +98,7 @@ do contrário o seu email será tratado como um possível spam pelo software da [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">Arquivo 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">via newsreader</a>] <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> - Uma lista de alto tráfego (150/dia) de somente leitura para monitorar a atividade na + Uma lista de alto tráfego (100/dia) de somente leitura para monitorar a atividade na <a href="//bugs.winehq.org/">Banco de Dados de Bugs</a>. <li> diff --git a/templates/tr/forums.template b/templates/tr/forums.template index dcee48c4..07e80b17 100644 --- a/templates/tr/forums.template +++ b/templates/tr/forums.template @@ -50,7 +50,7 @@ WWW</a> veya listeadı-request(a)winehq.org adresine konu satırı "subscri [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">Arşiv 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.devel">haber okuyucu ile</a>] <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> - Wine geliştirmesi, WineHQ, yamalar ve Wine geliştiricileri ile alakalı diğer şeylerle ilgili orta trafikli (25/gün) bir açık liste + Wine geliştirmesi, WineHQ, yamalar ve Wine geliştiricileri ile alakalı diğer şeylerle ilgili orta trafikli (50/gün) bir açık liste </li> <li> @@ -68,7 +68,7 @@ WWW</a> veya listeadı-request(a)winehq.org adresine konu satırı "subscri [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Arşiv 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">haber okuyucu ile</a>] <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> - A medium traffic (35/day) read only list which tracks commits to the Git + A medium traffic (25/day) read only list which tracks commits to the Git tree. </li> @@ -92,7 +92,7 @@ WWW</a> veya listeadı-request(a)winehq.org adresine konu satırı "subscri [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">Arşiv 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">haber okuyucu ile</a>] <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> - <a href="//bugs.winehq.org/">Hata İzleme Veritabanı</a> üzerinde etkinliği takip etmek için kullanılan yüksek trafikli (150/gün) salt okunur bir liste. + <a href="//bugs.winehq.org/">Hata İzleme Veritabanı</a> üzerinde etkinliği takip etmek için kullanılan yüksek trafikli (100/gün) salt okunur bir liste. </li> <li> diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index a50ba3b7..5ea77e85 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -57,7 +57,7 @@ WWW</a>，或者发送一封标题为“subscribe”的邮件到 指定列表 [<a href="http://news.gmane.org/gmane.comp.emulators.wine.devel">存档 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.devel">via newsreader</a>] <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> - 一个中等流量（25封/天）的开放性列表，用于讨论 Wine 开发、WineHQ、patches 或者其他 Wine 开发者感兴趣的事情。 + 一个中等流量（50封/天）的开放性列表，用于讨论 Wine 开发、WineHQ、patches 或者其他 Wine 开发者感兴趣的事情。 </li> <li> @@ -75,7 +75,7 @@ WWW</a>，或者发送一封标题为“subscribe”的邮件到 指定列表 [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">存档 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">via newsreader</a>] <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> - 一个中等流量（35封/天）的只读列表，用于追踪 Git tree 上的 commits。 + 一个中等流量（25封/天）的只读列表，用于追踪 Git tree 上的 commits。 </li> <li> @@ -98,7 +98,7 @@ WWW</a>，或者发送一封标题为“subscribe”的邮件到 指定列表 [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">存档 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">via newsreader</a>] <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> - 一个大流量（150封/天）的只读列表，用于监听 + 一个大流量（100封/天）的只读列表，用于监听 <a href="//bugs.winehq.org/">Bug Tracking Database</a> 的活动。 </li> -- 2.14.3

1 0

WineHQ Downtime Notice
by Jeremy Newman 03 Apr '18

03 Apr '18

WineHQ will be going down for some maintenance tonight (2018-03-26) starting at 21:00 CDT (-5 GMT). It will be offline for about 20 minutes while we swap out some equipment. The IP address for all WineHQ sites will also be changing. The DNS A records TTL are already down to 5 minutes, so DNS should switch over fairly quickly. We have already moved our primary and secondary DNS servers to the cloud, so they are no longer running directly on our box. I will reply to this message when the upgrades are complete, or if any plans change. -N

4 10

[PATCH] dmime: Call interface methods properly.
by Zebediah Figura 03 Apr '18

03 Apr '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dmime/audiopath.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index d656058..1aad13b 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -114,7 +114,7 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_Release (IDirectMusicAudioPath *if if (ref == 0) { if (This->pDSBuffer) - IDirectSoundBuffer8_Release(This->pDSBuffer); + IDirectSoundBuffer_Release(This->pDSBuffer); This->pPerf = NULL; HeapFree(GetProcessHeap(), 0, This); } @@ -140,7 +140,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud IsEqualIID (iidInterface, &IID_IDirectSoundBuffer) || IsEqualIID (iidInterface, &IID_IDirectSoundBuffer8) || IsEqualIID (iidInterface, &IID_IDirectSound3DBuffer)) { - return IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, iidInterface, ppObject); + return IDirectSoundBuffer_QueryInterface (This->pDSBuffer, iidInterface, ppObject); } WARN("Unsupported interface %s\n", debugstr_dmguid(iidInterface)); @@ -151,7 +151,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud case DMUS_PATH_PRIMARY_BUFFER: { if (IsEqualIID (iidInterface, &IID_IDirectSound3DListener)) { - IDirectSoundBuffer8_QueryInterface (This->pPrimary, &IID_IDirectSound3DListener, ppObject); + IDirectSoundBuffer_QueryInterface (This->pPrimary, &IID_IDirectSound3DListener, ppObject); return S_OK; } else { FIXME("bad iid...\n"); -- 2.7.4

4 8

[PATCH v3] dmime: Call interface methods properly.
by Zebediah Figura 03 Apr '18

03 Apr '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v3: appeal to git pedantry dlls/dmime/audiopath.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index d656058..bdd9201 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -114,7 +114,7 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_Release (IDirectMusicAudioPath *if if (ref == 0) { if (This->pDSBuffer) - IDirectSoundBuffer8_Release(This->pDSBuffer); + IDirectSoundBuffer_Release(This->pDSBuffer); This->pPerf = NULL; HeapFree(GetProcessHeap(), 0, This); } @@ -140,7 +140,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud IsEqualIID (iidInterface, &IID_IDirectSoundBuffer) || IsEqualIID (iidInterface, &IID_IDirectSoundBuffer8) || IsEqualIID (iidInterface, &IID_IDirectSound3DBuffer)) { - return IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, iidInterface, ppObject); + return IDirectSoundBuffer_QueryInterface(This->pDSBuffer, iidInterface, ppObject); } WARN("Unsupported interface %s\n", debugstr_dmguid(iidInterface)); @@ -151,7 +151,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud case DMUS_PATH_PRIMARY_BUFFER: { if (IsEqualIID (iidInterface, &IID_IDirectSound3DListener)) { - IDirectSoundBuffer8_QueryInterface (This->pPrimary, &IID_IDirectSound3DListener, ppObject); + IDirectSoundBuffer_QueryInterface(This->pPrimary, &IID_IDirectSound3DListener, ppObject); return S_OK; } else { FIXME("bad iid...\n"); -- 2.7.4

2 1

[PATCH v2] ntdll: Implement _alldvrm() and _aulldvrm().
by Zebediah Figura 03 Apr '18

03 Apr '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=42267 dlls/ntdll/large_int.c | 76 +++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 4 +- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +- 3 files changed, 80 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index a0d465c..b7d074f 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -627,6 +627,44 @@ LONGLONG WINAPI _allshr( LONGLONG a, LONG b ) } /****************************************************************************** + * _alldvrm (NTDLL.@) + * + * Divide two 64 bit integers. + * + * PARAMS + * a [I] Initial number. + * b [I] Number to divide a by. + * + * RETURNS + * Returns the quotient of a and b in edx:eax. + * Returns the remainder of a and b in ebx:ecx. + */ +__ASM_STDCALL_FUNC( _alldvrm, 16, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call _allrem\n\t" + "movl %edx, %ebx\n\t" + "movl %eax, %ecx\n\t" + "pushl %ecx\n\t" + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call _alldiv\n\t" + "popl %ecx\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret $16" ) + +/****************************************************************************** * _aullrem (NTDLL.@) * * Calculate the remainder after dividing two 64 bit unsigned integers. @@ -660,4 +698,42 @@ ULONGLONG WINAPI _aullshr( ULONGLONG a, LONG b ) return a >> b; } +/****************************************************************************** + * _aulldvrm (NTDLL.@) + * + * Divide two 64 bit unsigned integers. + * + * PARAMS + * a [I] Initial number. + * b [I] Number to divide a by. + * + * RETURNS + * Returns the quotient of a and b in edx:eax. + * Returns the remainder of a and b in ebx:ecx. + */ +__ASM_STDCALL_FUNC( _aulldvrm, 16, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call _aullrem\n\t" + "movl %edx, %ebx\n\t" + "movl %eax, %ecx\n\t" + "pushl %ecx\n\t" + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call _aulldiv\n\t" + "popl %ecx\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret $16" ) + #endif /* __i386__ */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0107932..8744704 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1337,7 +1337,7 @@ @ cdecl -private __iscsymf(long) NTDLL___iscsymf @ cdecl -private __toascii(long) NTDLL___toascii @ stdcall -arch=i386 -ret64 _alldiv(int64 int64) -# @ stub _alldvrm +@ stdcall -arch=i386 -norelay _alldvrm(int64 int64) @ stdcall -arch=i386 -ret64 _allmul(int64 int64) @ stdcall -arch=i386 -norelay _alloca_probe() @ stdcall -arch=i386 -ret64 _allrem(int64 int64) @@ -1345,7 +1345,7 @@ @ stdcall -arch=i386 -ret64 _allshr(int64 long) @ cdecl -private -ret64 _atoi64(str) @ stdcall -arch=i386 -ret64 _aulldiv(int64 int64) -# @ stub _aulldvrm +@ stdcall -arch=i386 -norelay _aulldvrm(int64 int64) @ stdcall -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) @ stdcall -private -arch=i386 -norelay _chkstk() diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 26afa6f..49f529a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1407,14 +1407,14 @@ @ cdecl -private -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -private _abnormal_termination() msvcrt._abnormal_termination @ stdcall -private -arch=i386 -ret64 _alldiv(int64 int64) -@ stub _alldvrm +@ stdcall -private -arch=i386 -norelay _alldvrm(int64 int64) @ stdcall -private -arch=i386 -ret64 _allmul(int64 int64) @ stdcall -private -arch=i386 -norelay _alloca_probe() @ stdcall -private -arch=i386 -ret64 _allrem(int64 int64) @ stdcall -private -arch=i386 -ret64 _allshl(int64 long) @ stdcall -private -arch=i386 -ret64 _allshr(int64 long) @ stdcall -private -arch=i386 -ret64 _aulldiv(int64 int64) -@ stub _aulldvrm +@ stdcall -private -arch=i386 -norelay _aulldvrm(int64 int64) @ stdcall -private -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -private -arch=i386 -ret64 _aullshr(int64 long) @ stdcall -private -arch=i386 -norelay _chkstk() -- 2.7.4

1 0

[PATCH] ntdll: Implement _alldvrm() and _aulldvrm().
by Zebediah Figura 03 Apr '18

03 Apr '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=42267 Inspired by a patch by Sebastian Lackner. dlls/ntdll/large_int.c | 76 ++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 4 +- dlls/ntdll/tests/large_int.c | 92 ++++++++++++++++++++++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +- 4 files changed, 171 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index a0d465c..b7d074f 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -627,6 +627,44 @@ LONGLONG WINAPI _allshr( LONGLONG a, LONG b ) } /****************************************************************************** + * _alldvrm (NTDLL.@) + * + * Divide two 64 bit integers. + * + * PARAMS + * a [I] Initial number. + * b [I] Number to divide a by. + * + * RETURNS + * Returns the quotient of a and b in edx:eax. + * Returns the remainder of a and b in ebx:ecx. + */ +__ASM_STDCALL_FUNC( _alldvrm, 16, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call _allrem\n\t" + "movl %edx, %ebx\n\t" + "movl %eax, %ecx\n\t" + "pushl %ecx\n\t" + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call _alldiv\n\t" + "popl %ecx\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret $16" ) + +/****************************************************************************** * _aullrem (NTDLL.@) * * Calculate the remainder after dividing two 64 bit unsigned integers. @@ -660,4 +698,42 @@ ULONGLONG WINAPI _aullshr( ULONGLONG a, LONG b ) return a >> b; } +/****************************************************************************** + * _aulldvrm (NTDLL.@) + * + * Divide two 64 bit unsigned integers. + * + * PARAMS + * a [I] Initial number. + * b [I] Number to divide a by. + * + * RETURNS + * Returns the quotient of a and b in edx:eax. + * Returns the remainder of a and b in ebx:ecx. + */ +__ASM_STDCALL_FUNC( _aulldvrm, 16, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call _aullrem\n\t" + "movl %edx, %ebx\n\t" + "movl %eax, %ecx\n\t" + "pushl %ecx\n\t" + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call _aulldiv\n\t" + "popl %ecx\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret $16" ) + #endif /* __i386__ */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0107932..8744704 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1337,7 +1337,7 @@ @ cdecl -private __iscsymf(long) NTDLL___iscsymf @ cdecl -private __toascii(long) NTDLL___toascii @ stdcall -arch=i386 -ret64 _alldiv(int64 int64) -# @ stub _alldvrm +@ stdcall -arch=i386 -norelay _alldvrm(int64 int64) @ stdcall -arch=i386 -ret64 _allmul(int64 int64) @ stdcall -arch=i386 -norelay _alloca_probe() @ stdcall -arch=i386 -ret64 _allrem(int64 int64) @@ -1345,7 +1345,7 @@ @ stdcall -arch=i386 -ret64 _allshr(int64 long) @ cdecl -private -ret64 _atoi64(str) @ stdcall -arch=i386 -ret64 _aulldiv(int64 int64) -# @ stub _aulldvrm +@ stdcall -arch=i386 -norelay _aulldvrm(int64 int64) @ stdcall -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) @ stdcall -private -arch=i386 -norelay _chkstk() diff --git a/dlls/ntdll/tests/large_int.c b/dlls/ntdll/tests/large_int.c index da7afa4..70ea0b0 100644 --- a/dlls/ntdll/tests/large_int.c +++ b/dlls/ntdll/tests/large_int.c @@ -33,7 +33,8 @@ static VOID (WINAPI *pRtlFreeAnsiString)(PSTRING); static NTSTATUS (WINAPI *pRtlInt64ToUnicodeString)(ULONGLONG, ULONG, UNICODE_STRING *); static NTSTATUS (WINAPI *pRtlLargeIntegerToChar)(ULONGLONG *, ULONG, ULONG, PCHAR); static NTSTATUS (WINAPI *pRtlUnicodeStringToAnsiString)(STRING *, const UNICODE_STRING *, BOOLEAN); - +static LONGLONG (WINAPI *p_alldvrm)(LONGLONG, LONGLONG); +static ULONGLONG (WINAPI *p_aulldvrm)(ULONGLONG, ULONGLONG); static void InitFunctionPtrs(void) { @@ -45,6 +46,8 @@ static void InitFunctionPtrs(void) pRtlInt64ToUnicodeString = (void *)GetProcAddress(hntdll, "RtlInt64ToUnicodeString"); pRtlLargeIntegerToChar = (void *)GetProcAddress(hntdll, "RtlLargeIntegerToChar"); pRtlUnicodeStringToAnsiString = (void *)GetProcAddress(hntdll, "RtlUnicodeStringToAnsiString"); + p_alldvrm = (void *)GetProcAddress(hntdll, "_alldvrm"); + p_aulldvrm = (void *)GetProcAddress(hntdll, "_aulldvrm"); } /* if */ } @@ -434,6 +437,90 @@ static void test_RtlLargeIntegerToChar(void) largeint2str[0].base, largeint2str[0].MaximumLength, result, STATUS_ACCESS_VIOLATION); } +#ifdef __i386__ +static LONGLONG _alldvrm_wrapper(LARGE_INTEGER a, LARGE_INTEGER b, LARGE_INTEGER *rem) +{ + /* _alldvrm() divides two LONGLONGs and returns the quotient in edx:eax and + * the remainder in ebx:ecx. */ + + LONGLONG ret; + + __asm__ __volatile__ ( + "pushl %%ebx\n\t" + "pushl %3\n\t" + "pushl %4\n\t" + "pushl %5\n\t" + "pushl %6\n\t" + "call *%7\n\t" + "movl %%ebx, %1\n\t" + "movl %%ecx, %2\n\t" + "popl %%ebx\n\t" + : "=A" (ret), "=r" (rem->HighPart), "=r" (rem->LowPart) + : "ri" (b.HighPart), "ri" (b.LowPart), "ri" (a.HighPart), "ri" (a.LowPart), "m" (p_alldvrm) + : "ebx", "ecx" + ); + + return ret; +} + +static ULONGLONG _aulldvrm_wrapper(ULARGE_INTEGER a, ULARGE_INTEGER b, ULARGE_INTEGER *rem) +{ + ULONGLONG ret; + + __asm__ __volatile__ ( + "pushl %%ebx\n\t" + "pushl %3\n\t" + "pushl %4\n\t" + "pushl %5\n\t" + "pushl %6\n\t" + "call *%7\n\t" + "movl %%ebx, %1\n\t" + "movl %%ecx, %2\n\t" + "popl %%ebx\n\t" + : "=A" (ret), "=r" (rem->HighPart), "=r" (rem->LowPart) + : "ri" (b.HighPart), "ri" (b.LowPart), "ri" (a.HighPart), "ri" (a.LowPart), "m" (p_aulldvrm) + : "ebx", "ecx" + ); + + return ret; +} + +static void test__alldvrm(void) +{ + ULARGE_INTEGER ua, ub, urem; + LARGE_INTEGER a, b, rem; + ULONGLONG uret; + LONGLONG ret; + + /* _alldvrm(0x0123456701234567, 3) */ + a.HighPart = a.LowPart = 0x01234567; + b.QuadPart = 3; + ret = _alldvrm_wrapper(a, b, &rem); + ok(ret == 0x61172255b66c77ULL, "got %x%08x\n", (DWORD)(ret >> 32), (DWORD)ret); + ok(rem.QuadPart == 2, "got %x%08x\n", rem.HighPart, rem.LowPart); + + /* _alldvrm(0x0123456701234567, -3) */ + a.HighPart = a.LowPart = 0x01234567; + b.QuadPart = -3; + ret = _alldvrm_wrapper(a, b, &rem); + ok(ret == 0xff9ee8ddaa499389ULL, "got %x%08x\n", (DWORD)(ret >> 32), (DWORD)ret); + ok(rem.QuadPart == 2, "got %x%08x\n", rem.HighPart, rem.LowPart); + + /* _aulldvrm(0x0123456701234567, 3) */ + ua.HighPart = ua.LowPart = 0x01234567; + ub.QuadPart = 3; + uret = _aulldvrm_wrapper(ua, ub, &urem); + ok(uret == 0x61172255b66c77ULL, "got %x%08x\n", (DWORD)(uret >> 32), (DWORD)uret); + ok(urem.QuadPart == 2, "got %x%08x\n", urem.HighPart, urem.LowPart); + + /* _aulldvrm(0x0123456701234567, -3) */ + ua.HighPart = ua.LowPart = 0x01234567; + ub.QuadPart = -3; + uret = _aulldvrm_wrapper(ua, ub, &urem); + ok(uret == 0, "got %x%08x\n", (DWORD)(uret >> 32), (DWORD)uret); + ok(urem.QuadPart == ua.QuadPart, "got %x%08x\n", urem.HighPart, urem.LowPart); +} +#endif /* __i386__ */ START_TEST(large_int) { @@ -445,4 +532,7 @@ START_TEST(large_int) test_RtlInt64ToUnicodeString(); if (pRtlLargeIntegerToChar) test_RtlLargeIntegerToChar(); +#ifdef __i386__ + test__alldvrm(); +#endif /* __i386__ */ } diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 26afa6f..49f529a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1407,14 +1407,14 @@ @ cdecl -private -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -private _abnormal_termination() msvcrt._abnormal_termination @ stdcall -private -arch=i386 -ret64 _alldiv(int64 int64) -@ stub _alldvrm +@ stdcall -private -arch=i386 -norelay _alldvrm(int64 int64) @ stdcall -private -arch=i386 -ret64 _allmul(int64 int64) @ stdcall -private -arch=i386 -norelay _alloca_probe() @ stdcall -private -arch=i386 -ret64 _allrem(int64 int64) @ stdcall -private -arch=i386 -ret64 _allshl(int64 long) @ stdcall -private -arch=i386 -ret64 _allshr(int64 long) @ stdcall -private -arch=i386 -ret64 _aulldiv(int64 int64) -@ stub _aulldvrm +@ stdcall -private -arch=i386 -norelay _aulldvrm(int64 int64) @ stdcall -private -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -private -arch=i386 -ret64 _aullshr(int64 long) @ stdcall -private -arch=i386 -norelay _chkstk() -- 2.7.4

2 2

[PATCH vkd3d 1/2] libs/vkd3d: Add structure type fields to public API structures.
by Józef Kucia 03 Apr '18

03 Apr '18

From: Józef Kucia <jkucia(a)codeweavers.com> Adds flexibility for future API extensions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- demos/demo_xcb.h | 2 ++ include/vkd3d.h | 20 ++++++++++++++++++++ libs/vkd3d-utils/vkd3d_utils_main.c | 4 ++++ libs/vkd3d/device.c | 12 +++++++++++- libs/vkd3d/resource.c | 10 ++++++++++ libs/vkd3d/vkd3d_main.c | 7 +++++++ tests/vkd3d_api.c | 4 ++++ 7 files changed, 58 insertions(+), 1 deletion(-) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index 053db0df9bab..38715565267e 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -446,6 +446,8 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX); vkResetFences(vk_device, 1, &vk_fence); + resource_create_info.type = VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO; + resource_create_info.next = NULL; resource_create_info.desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; resource_create_info.desc.Alignment = 0; resource_create_info.desc.Width = desc->width; diff --git a/include/vkd3d.h b/include/vkd3d.h index 692b58d70065..7c5f6441e9d9 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -34,6 +34,17 @@ extern "C" { #endif /* __cplusplus */ +#define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff + +enum vkd3d_structure_type +{ + VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, + VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO, + VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_STRUCTURE_TYPE), +}; + typedef bool (*PFN_vkd3d_signal_event)(HANDLE event); typedef void * (*PFN_vkd3d_thread)(void *data); @@ -45,6 +56,9 @@ struct vkd3d_instance; struct vkd3d_instance_create_info { + enum vkd3d_structure_type type; + const void *next; + PFN_vkd3d_signal_event pfn_signal_event; PFN_vkd3d_create_thread pfn_create_thread; PFN_vkd3d_join_thread pfn_join_thread; @@ -59,6 +73,9 @@ struct vkd3d_instance_create_info struct vkd3d_device_create_info { + enum vkd3d_structure_type type; + const void *next; + D3D_FEATURE_LEVEL minimum_feature_level; struct vkd3d_instance *instance; @@ -79,6 +96,9 @@ struct vkd3d_device_create_info struct vkd3d_image_resource_create_info { + enum vkd3d_structure_type type; + const void *next; + VkImage vk_image; D3D12_RESOURCE_DESC desc; unsigned int flags; diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index ba64d406983c..adafb00bddc8 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -48,12 +48,16 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, FIXME("Ignoring adapter %p.\n", adapter); memset(&instance_create_info, 0, sizeof(instance_create_info)); + instance_create_info.type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + instance_create_info.next = NULL; instance_create_info.pfn_signal_event = vkd3d_signal_event; instance_create_info.wchar_size = sizeof(WCHAR); instance_create_info.instance_extensions = instance_extensions; instance_create_info.instance_extension_count = ARRAY_SIZE(instance_extensions); memset(&device_create_info, 0, sizeof(device_create_info)); + device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO; + device_create_info.next = NULL; device_create_info.minimum_feature_level = minimum_feature_level; device_create_info.instance_create_info = &instance_create_info; device_create_info.device_extensions = device_extensions; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index d61c331929f7..57b94b64239d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -342,7 +342,17 @@ HRESULT vkd3d_create_instance(const struct vkd3d_instance_create_info *create_in struct vkd3d_instance *object; HRESULT hr; - TRACE("create_info %p.\n", create_info); + TRACE("create_info %p, instance %p.\n", create_info, instance); + + if (!create_info || !instance) + return E_INVALIDARG; + if (create_info->type != VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO) + { + WARN("Invalid structure type %#x.\n", create_info->type); + return E_INVALIDARG; + } + if (create_info->next) + WARN("Unhandled next %p.\n", create_info->next); if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 4746ee2cf59b..e37b03bc005f 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -805,6 +805,16 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, TRACE("device %p, create_info %p, resource %p.\n", device, create_info, resource); + if (!create_info || !resource) + return E_INVALIDARG; + if (create_info->type != VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO) + { + WARN("Invalid structure type %#x.\n", create_info->type); + return E_INVALIDARG; + } + if (create_info->next) + WARN("Unhandled next %p.\n", create_info->next); + if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index b58e6e5ac53c..97d642a7cf91 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -30,6 +30,13 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, if (!create_info || !device) return E_INVALIDARG; + if (create_info->type != VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO) + { + WARN("Invalid structure type %#x.\n", create_info->type); + return E_INVALIDARG; + } + if (create_info->next) + WARN("Unhandled next %p.\n", create_info->next); if (!create_info->instance && !create_info->instance_create_info) { ERR("Instance or instance create info is required.\n"); diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 4b3466edc919..439cb6364eb8 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -62,12 +62,14 @@ static bool signal_event(HANDLE event) static const struct vkd3d_instance_create_info instance_default_create_info = { + .type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, .wchar_size = sizeof(WCHAR), .pfn_signal_event = signal_event, }; static const struct vkd3d_device_create_info device_default_create_info = { + .type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO, .minimum_feature_level = D3D_FEATURE_LEVEL_11_0, .instance_create_info = &instance_default_create_info, }; @@ -849,6 +851,8 @@ static void test_vulkan_resource_present_state(void) vk_memory = allocate_vulkan_image_memory(device, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, vk_image); + resource_create_info.type = VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO; + resource_create_info.next = NULL; resource_create_info.vk_image = vk_image; resource_create_info.desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; resource_create_info.desc.Alignment = 0; -- 2.16.1

2 3