December 2012 - Wine-Commits

Alexandre Julliard : gdi32: Store and return ABC metrics from get_glyph_outline.
by Alexandre Julliard Dec. 4, 2012

Dec. 4, 2012

Module: wine Branch: master Commit: e8b6701fe126702004e66b404962bbf38a52c233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8b6701fe126702004e66b404… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 4 18:14:56 2012 +0100 gdi32: Store and return ABC metrics from get_glyph_outline. --- dlls/gdi32/freetype.c | 85 +++++++++++++++--------------------------------- 1 files changed, 27 insertions(+), 58 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 98c66a0..c5543e1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -288,10 +288,8 @@ typedef struct tagFamily { typedef struct { GLYPHMETRICS gm; - INT adv; /* These three hold to widths of the unrotated chars */ - INT lsb; - INT bbx; - BOOL init; + ABC abc; /* metrics of the unrotated char */ + BOOL init; } GM; typedef struct { @@ -5852,7 +5850,7 @@ static inline BYTE get_max_level( UINT format ) static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, - LPGLYPHMETRICS lpgm, DWORD buflen, LPVOID buf, + LPGLYPHMETRICS lpgm, ABC *abc, DWORD buflen, LPVOID buf, const MAT2* lpmat) { static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; @@ -5862,7 +5860,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, DWORD width, height, pitch, needed = 0; FT_Bitmap ft_bitmap; FT_Error err; - INT left, right, top = 0, bottom = 0, adv, lsb, bbx; + INT left, right, top = 0, bottom = 0, adv; FT_Angle angle = 0; FT_Int load_flags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; double widthRatio = 1.0; @@ -5907,6 +5905,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, FONT_GM(font,original_index)->init && is_identity_MAT2(lpmat)) { *lpgm = FONT_GM(font,original_index)->gm; + *abc = FONT_GM(font,original_index)->abc; TRACE("cached: %u,%u,%s,%d,%d\n", lpgm->gmBlackBoxX, lpgm->gmBlackBoxY, wine_dbgstr_point(&lpgm->gmptGlyphOrigin), lpgm->gmCellIncX, lpgm->gmCellIncY); @@ -6059,12 +6058,13 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, adv = (vec.x+63) >> 6; } - lsb = left >> 6; - bbx = (right - left) >> 6; lpgm->gmBlackBoxX = (right - left) >> 6; lpgm->gmBlackBoxY = (top - bottom) >> 6; lpgm->gmptGlyphOrigin.x = left >> 6; lpgm->gmptGlyphOrigin.y = top >> 6; + abc->abcA = left >> 6; + abc->abcB = (right - left) >> 6; + abc->abcC = adv - abc->abcA - abc->abcB; TRACE("%u,%u,%s,%d,%d\n", lpgm->gmBlackBoxX, lpgm->gmBlackBoxY, wine_dbgstr_point(&lpgm->gmptGlyphOrigin), @@ -6074,9 +6074,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, is_identity_MAT2(lpmat)) /* don't cache custom transforms */ { FONT_GM(font,original_index)->gm = *lpgm; - FONT_GM(font,original_index)->adv = adv; - FONT_GM(font,original_index)->lsb = lsb; - FONT_GM(font,original_index)->bbx = bbx; + FONT_GM(font,original_index)->abc = *abc; FONT_GM(font,original_index)->init = TRUE; } @@ -7058,6 +7056,7 @@ static DWORD freetype_GetGlyphOutline( PHYSDEV dev, UINT glyph, UINT format, { struct freetype_physdev *physdev = get_freetype_dev( dev ); DWORD ret; + ABC abc; if (!physdev->font) { @@ -7067,7 +7066,7 @@ static DWORD freetype_GetGlyphOutline( PHYSDEV dev, UINT glyph, UINT format, GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); - ret = get_glyph_outline( physdev->font, glyph, format, lpgm, buflen, buf, lpmat ); + ret = get_glyph_outline( physdev->font, glyph, format, lpgm, &abc, buflen, buf, lpmat ); LeaveCriticalSection( &freetype_cs ); return ret; } @@ -7197,8 +7196,7 @@ static BOOL freetype_GetCharWidth( PHYSDEV dev, UINT firstChar, UINT lastChar, L static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; UINT c; GLYPHMETRICS gm; - FT_UInt glyph_index; - GdiFont *linked_font; + ABC abc; struct freetype_physdev *physdev = get_freetype_dev( dev ); if (!physdev->font) @@ -7212,10 +7210,8 @@ static BOOL freetype_GetCharWidth( PHYSDEV dev, UINT firstChar, UINT lastChar, L GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); for(c = firstChar; c <= lastChar; c++) { - get_glyph_index_linked(physdev->font, c, &linked_font, &glyph_index); - get_glyph_outline(linked_font, glyph_index, GGO_METRICS | GGO_GLYPH_INDEX, - &gm, 0, NULL, &identity); - buffer[c - firstChar] = FONT_GM(linked_font,glyph_index)->adv; + get_glyph_outline( physdev->font, c, GGO_METRICS, &gm, &abc, 0, NULL, &identity ); + buffer[c - firstChar] = abc.abcA + abc.abcB + abc.abcC; } LeaveCriticalSection( &freetype_cs ); return TRUE; @@ -7229,8 +7225,6 @@ static BOOL freetype_GetCharABCWidths( PHYSDEV dev, UINT firstChar, UINT lastCha static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; UINT c; GLYPHMETRICS gm; - FT_UInt glyph_index; - GdiFont *linked_font; struct freetype_physdev *physdev = get_freetype_dev( dev ); if (!physdev->font) @@ -7244,15 +7238,9 @@ static BOOL freetype_GetCharABCWidths( PHYSDEV dev, UINT firstChar, UINT lastCha GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); - for(c = firstChar; c <= lastChar; c++) { - get_glyph_index_linked(physdev->font, c, &linked_font, &glyph_index); - get_glyph_outline(linked_font, glyph_index, GGO_METRICS | GGO_GLYPH_INDEX, - &gm, 0, NULL, &identity); - buffer[c - firstChar].abcA = FONT_GM(linked_font,glyph_index)->lsb; - buffer[c - firstChar].abcB = FONT_GM(linked_font,glyph_index)->bbx; - buffer[c - firstChar].abcC = FONT_GM(linked_font,glyph_index)->adv - FONT_GM(linked_font,glyph_index)->lsb - - FONT_GM(linked_font,glyph_index)->bbx; - } + for(c = firstChar; c <= lastChar; c++, buffer++) + get_glyph_outline( physdev->font, c, GGO_METRICS, &gm, buffer, 0, NULL, &identity ); + LeaveCriticalSection( &freetype_cs ); return TRUE; } @@ -7265,8 +7253,6 @@ static BOOL freetype_GetCharABCWidthsI( PHYSDEV dev, UINT firstChar, UINT count, static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; UINT c; GLYPHMETRICS gm; - FT_UInt glyph_index; - GdiFont *linked_font; struct freetype_physdev *physdev = get_freetype_dev( dev ); if (!physdev->font) @@ -7281,25 +7267,9 @@ static BOOL freetype_GetCharABCWidthsI( PHYSDEV dev, UINT firstChar, UINT count, GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); - get_glyph_index_linked(physdev->font, 'a', &linked_font, &glyph_index); - if (!pgi) - for(c = firstChar; c < firstChar+count; c++) { - get_glyph_outline(linked_font, c, GGO_METRICS | GGO_GLYPH_INDEX, - &gm, 0, NULL, &identity); - buffer[c - firstChar].abcA = FONT_GM(linked_font,c)->lsb; - buffer[c - firstChar].abcB = FONT_GM(linked_font,c)->bbx; - buffer[c - firstChar].abcC = FONT_GM(linked_font,c)->adv - FONT_GM(linked_font,c)->lsb - - FONT_GM(linked_font,c)->bbx; - } - else - for(c = 0; c < count; c++) { - get_glyph_outline(linked_font, pgi[c], GGO_METRICS | GGO_GLYPH_INDEX, - &gm, 0, NULL, &identity); - buffer[c].abcA = FONT_GM(linked_font,pgi[c])->lsb; - buffer[c].abcB = FONT_GM(linked_font,pgi[c])->bbx; - buffer[c].abcC = FONT_GM(linked_font,pgi[c])->adv - - FONT_GM(linked_font,pgi[c])->lsb - FONT_GM(linked_font,pgi[c])->bbx; - } + for(c = 0; c < count; c++, buffer++) + get_glyph_outline( physdev->font, pgi ? pgi[c] : firstChar + c, GGO_METRICS | GGO_GLYPH_INDEX, + &gm, buffer, 0, NULL, &identity ); LeaveCriticalSection( &freetype_cs ); return TRUE; @@ -7314,10 +7284,9 @@ static BOOL freetype_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR wstr, INT count, static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; INT idx; INT nfit = 0, ext; + ABC abc; GLYPHMETRICS gm; TEXTMETRICW tm; - FT_UInt glyph_index; - GdiFont *linked_font; struct freetype_physdev *physdev = get_freetype_dev( dev ); if (!physdev->font) @@ -7336,10 +7305,8 @@ static BOOL freetype_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR wstr, INT count, size->cy = tm.tmHeight; for(idx = 0; idx < count; idx++) { - get_glyph_index_linked( physdev->font, wstr[idx], &linked_font, &glyph_index ); - get_glyph_outline(linked_font, glyph_index, GGO_METRICS | GGO_GLYPH_INDEX, - &gm, 0, NULL, &identity); - size->cx += FONT_GM(linked_font,glyph_index)->adv; + get_glyph_outline( physdev->font, wstr[idx], GGO_METRICS, &gm, &abc, 0, NULL, &identity ); + size->cx += abc.abcA + abc.abcB + abc.abcC; ext = size->cx; if (! pnfit || ext <= max_ext) { ++nfit; @@ -7365,6 +7332,7 @@ static BOOL freetype_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, IN static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; INT idx; INT nfit = 0, ext; + ABC abc; GLYPHMETRICS gm; TEXTMETRICW tm; struct freetype_physdev *physdev = get_freetype_dev( dev ); @@ -7385,8 +7353,9 @@ static BOOL freetype_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, IN size->cy = tm.tmHeight; for(idx = 0; idx < count; idx++) { - get_glyph_outline(physdev->font, indices[idx], GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, NULL, &identity); - size->cx += FONT_GM(physdev->font,indices[idx])->adv; + get_glyph_outline( physdev->font, indices[idx], GGO_METRICS | GGO_GLYPH_INDEX, + &gm, &abc, 0, NULL, &identity ); + size->cx += abc.abcA + abc.abcB + abc.abcC; ext = size->cx; if (! pnfit || ext <= max_ext) { ++nfit;

1 0

Alexandre Julliard : configure: Building the tools requires include/config. h.
by Alexandre Julliard Dec. 4, 2012

Dec. 4, 2012

Module: wine Branch: master Commit: bd1e261b063fe1624fe94cb56a5e17f2679c6793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd1e261b063fe1624fe94cb56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 4 15:58:47 2012 +0100 configure: Building the tools requires include/config.h. --- aclocal.m4 | 2 ++ configure | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 0062982..14cf916 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -179,6 +179,8 @@ wine_fn_all_dir_rules () then dnl makedep is in tools so tools makefile cannot depend on it ac_alldeps="$[2] $ac_makedep" + else + ac_alldeps="$[2] include/config.h" fi case $[2] in *.in) ac_input=$ac_input:$[2] ;; diff --git a/configure b/configure index 99efc84..2da5477 100755 --- a/configure +++ b/configure @@ -14842,6 +14842,8 @@ wine_fn_all_dir_rules () if test $ac_dir != tools then ac_alldeps="$2 $ac_makedep" + else + ac_alldeps="$2 include/config.h" fi case $2 in *.in) ac_input=$ac_input:$2 ;;

1 0

Michael Stefaniuc : qmgr: Parameter cleanup for a helper function.
by Alexandre Julliard Dec. 4, 2012

Dec. 4, 2012

Module: wine Branch: master Commit: 022e3f5333e690945be70cc306e3baa22aa417bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=022e3f5333e690945be70cc30… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 4 00:59:02 2012 +0100 qmgr: Parameter cleanup for a helper function. --- dlls/qmgr/enum_jobs.c | 8 +++----- dlls/qmgr/qmgr.c | 2 +- dlls/qmgr/qmgr.h | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/qmgr/enum_jobs.c b/dlls/qmgr/enum_jobs.c index 85aca47..1805a6a 100644 --- a/dlls/qmgr/enum_jobs.c +++ b/dlls/qmgr/enum_jobs.c @@ -163,15 +163,13 @@ static const IEnumBackgroundCopyJobsVtbl BITS_IEnumBackgroundCopyJobs_Vtbl = BITS_IEnumBackgroundCopyJobs_GetCount }; -HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, - IBackgroundCopyManager* copyManager) +HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr, IEnumBackgroundCopyJobs **enumjob) { - BackgroundCopyManagerImpl *qmgr = (BackgroundCopyManagerImpl *) copyManager; EnumBackgroundCopyJobsImpl *This; BackgroundCopyJobImpl *job; ULONG i; - TRACE("%p, %p)\n", ppObj, copyManager); + TRACE("%p, %p)\n", qmgr, enumjob); This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); if (!This) @@ -208,6 +206,6 @@ HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, } LeaveCriticalSection(&qmgr->cs); - *ppObj = &This->lpVtbl; + *enumjob = (IEnumBackgroundCopyJobs *)&This->lpVtbl; return S_OK; } diff --git a/dlls/qmgr/qmgr.c b/dlls/qmgr/qmgr.c index 55a01e6..7b11b66 100644 --- a/dlls/qmgr/qmgr.c +++ b/dlls/qmgr/qmgr.c @@ -85,7 +85,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyManager_EnumJobs(IBackgroundCopyManage DWORD dwFlags, IEnumBackgroundCopyJobs **ppEnum) { TRACE("\n"); - return EnumBackgroundCopyJobsConstructor((LPVOID *) ppEnum, iface); + return enum_copy_job_create(&globalMgr, ppEnum); } static HRESULT WINAPI BITS_IBackgroundCopyManager_GetErrorDescription(IBackgroundCopyManager *iface, diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 1057880..d591d20 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -100,8 +100,8 @@ extern BackgroundCopyManagerImpl globalMgr DECLSPEC_HIDDEN; HRESULT BackgroundCopyManagerConstructor(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID *pJobId, LPVOID *ppObj) DECLSPEC_HIDDEN; -HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, - IBackgroundCopyManager* copyManager) DECLSPEC_HIDDEN; +HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr, + IEnumBackgroundCopyJobs **enumjob) DECLSPEC_HIDDEN; HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, LPCWSTR remoteName, LPCWSTR localName, LPVOID *ppObj) DECLSPEC_HIDDEN;

1 0

Michael Stefaniuc : qmgr: COM cleanup for the IBackgroundCopyManager iface.
by Alexandre Julliard Dec. 4, 2012

Dec. 4, 2012

Module: wine Branch: master Commit: a3fdfa22ffaf5093bbf5b8a90c4b6544345fba26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3fdfa22ffaf5093bbf5b8a90… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 4 00:57:09 2012 +0100 qmgr: COM cleanup for the IBackgroundCopyManager iface. --- dlls/qmgr/qmgr.c | 72 +++++++++++++++++++---------------------------------- dlls/qmgr/qmgr.h | 2 +- 2 files changed, 27 insertions(+), 47 deletions(-) diff --git a/dlls/qmgr/qmgr.c b/dlls/qmgr/qmgr.c index 1ff6050..55a01e6 100644 --- a/dlls/qmgr/qmgr.c +++ b/dlls/qmgr/qmgr.c @@ -23,52 +23,39 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); -/* Add a reference to the iface pointer */ -static ULONG WINAPI BITS_IBackgroundCopyManager_AddRef( - IBackgroundCopyManager* iface) -{ - return 2; -} +BackgroundCopyManagerImpl globalMgr; -/* Attempt to provide a new interface to interact with iface */ -static HRESULT WINAPI BITS_IBackgroundCopyManager_QueryInterface( - IBackgroundCopyManager* iface, - REFIID riid, - LPVOID *ppvObject) +static HRESULT WINAPI BITS_IBackgroundCopyManager_QueryInterface(IBackgroundCopyManager *iface, + REFIID riid, void **ppv) { - BackgroundCopyManagerImpl * This = (BackgroundCopyManagerImpl *)iface; - - TRACE("IID: %s\n", debugstr_guid(riid)); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IBackgroundCopyManager)) + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IBackgroundCopyManager)) { - *ppvObject = &This->lpVtbl; - BITS_IBackgroundCopyManager_AddRef(iface); + *ppv = iface; + IBackgroundCopyManager_AddRef(iface); return S_OK; } - *ppvObject = NULL; + *ppv = NULL; return E_NOINTERFACE; } -/* Release an interface to iface */ -static ULONG WINAPI BITS_IBackgroundCopyManager_Release( - IBackgroundCopyManager* iface) +static ULONG WINAPI BITS_IBackgroundCopyManager_AddRef(IBackgroundCopyManager *iface) +{ + return 2; +} + +static ULONG WINAPI BITS_IBackgroundCopyManager_Release(IBackgroundCopyManager *iface) { return 1; } /*** IBackgroundCopyManager interface methods ***/ -static HRESULT WINAPI BITS_IBackgroundCopyManager_CreateJob( - IBackgroundCopyManager* iface, - LPCWSTR DisplayName, - BG_JOB_TYPE Type, - GUID *pJobId, - IBackgroundCopyJob **ppJob) +static HRESULT WINAPI BITS_IBackgroundCopyManager_CreateJob(IBackgroundCopyManager *iface, + LPCWSTR DisplayName, BG_JOB_TYPE Type, GUID *pJobId, IBackgroundCopyJob **ppJob) { - BackgroundCopyManagerImpl * This = (BackgroundCopyManagerImpl *) iface; BackgroundCopyJobImpl *job; HRESULT hres; TRACE("\n"); @@ -81,35 +68,28 @@ static HRESULT WINAPI BITS_IBackgroundCopyManager_CreateJob( /* Add a reference to the job to job list */ IBackgroundCopyJob_AddRef(*ppJob); job = (BackgroundCopyJobImpl *) *ppJob; - EnterCriticalSection(&This->cs); - list_add_head(&This->jobs, &job->entryFromQmgr); - LeaveCriticalSection(&This->cs); + EnterCriticalSection(&globalMgr.cs); + list_add_head(&globalMgr.jobs, &job->entryFromQmgr); + LeaveCriticalSection(&globalMgr.cs); return S_OK; } -static HRESULT WINAPI BITS_IBackgroundCopyManager_GetJob( - IBackgroundCopyManager* iface, - REFGUID jobID, - IBackgroundCopyJob **ppJob) +static HRESULT WINAPI BITS_IBackgroundCopyManager_GetJob(IBackgroundCopyManager *iface, + REFGUID jobID, IBackgroundCopyJob **ppJob) { FIXME("Not implemented\n"); return E_NOTIMPL; } -static HRESULT WINAPI BITS_IBackgroundCopyManager_EnumJobs( - IBackgroundCopyManager* iface, - DWORD dwFlags, - IEnumBackgroundCopyJobs **ppEnum) +static HRESULT WINAPI BITS_IBackgroundCopyManager_EnumJobs(IBackgroundCopyManager *iface, + DWORD dwFlags, IEnumBackgroundCopyJobs **ppEnum) { TRACE("\n"); return EnumBackgroundCopyJobsConstructor((LPVOID *) ppEnum, iface); } -static HRESULT WINAPI BITS_IBackgroundCopyManager_GetErrorDescription( - IBackgroundCopyManager* iface, - HRESULT hResult, - DWORD LanguageId, - LPWSTR *pErrorDescription) +static HRESULT WINAPI BITS_IBackgroundCopyManager_GetErrorDescription(IBackgroundCopyManager *iface, + HRESULT hResult, DWORD LanguageId, LPWSTR *pErrorDescription) { FIXME("Not implemented\n"); return E_NOTIMPL; @@ -128,7 +108,7 @@ static const IBackgroundCopyManagerVtbl BITS_IBackgroundCopyManager_Vtbl = }; BackgroundCopyManagerImpl globalMgr = { - &BITS_IBackgroundCopyManager_Vtbl, + { &BITS_IBackgroundCopyManager_Vtbl }, { NULL, -1, 0, 0, 0, 0 }, NULL, LIST_INIT(globalMgr.jobs) diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index c504396..1057880 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -81,7 +81,7 @@ typedef struct /* Background copy manager vtbl and related data */ typedef struct { - const IBackgroundCopyManagerVtbl *lpVtbl; + IBackgroundCopyManager IBackgroundCopyManager_iface; /* Protects job list, job states, and jobEvent */ CRITICAL_SECTION cs; HANDLE jobEvent;

1 0

Andrew Eikum : winecoreaudio.drv: Improve IsFormatSupported handling.
by Alexandre Julliard Dec. 4, 2012

Dec. 4, 2012

Module: wine Branch: master Commit: af20740d07a3f29e3e6bb7d5175b45b75059eb3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=af20740d07a3f29e3e6bb7d51… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 3 10:28:07 2012 -0600 winecoreaudio.drv: Improve IsFormatSupported handling. --- dlls/winecoreaudio.drv/mmdevdrv.c | 47 ++++++++++++++++++++++++++++++++---- 1 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 06f46f7..8ee0dec 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1131,6 +1131,12 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, if( duration < 3 * period) duration = 3 * period; }else{ + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask == 0 || + ((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask & SPEAKER_RESERVED) + return AUDCLNT_E_UNSUPPORTED_FORMAT; + } + if(!period) period = DefaultPeriod; /* not minimum */ if(period < MinimumPeriod || period > 5000000) @@ -1445,12 +1451,31 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, dump_fmt(pwfx); - if(outpwfx) + if(outpwfx){ *outpwfx = NULL; + if(mode != AUDCLNT_SHAREMODE_SHARED) + outpwfx = NULL; + } + + if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(pwfx->nAvgBytesPerSec == 0 || + pwfx->nBlockAlign == 0 || + fmtex->Samples.wValidBitsPerSample > pwfx->wBitsPerSample) + return E_INVALIDARG; + if(fmtex->Samples.wValidBitsPerSample < pwfx->wBitsPerSample) + goto unsupported; + if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE){ + if(fmtex->dwChannelMask == 0 || + fmtex->dwChannelMask & SPEAKER_RESERVED) + goto unsupported; + } + } - if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - fmtex->dwChannelMask != 0 && - fmtex->dwChannelMask != get_channel_mask(pwfx->nChannels)) + if(pwfx->nBlockAlign != pwfx->nChannels * pwfx->wBitsPerSample / 8 || + pwfx->nAvgBytesPerSec != pwfx->nBlockAlign * pwfx->nSamplesPerSec) + goto unsupported; + + if(pwfx->nChannels == 0) return AUDCLNT_E_UNSUPPORTED_FORMAT; OSSpinLockLock(&This->lock); @@ -1462,10 +1487,20 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, TRACE("returning %08x\n", S_OK); return S_OK; } - OSSpinLockUnlock(&This->lock); + if(hr != AUDCLNT_E_UNSUPPORTED_FORMAT){ + TRACE("returning %08x\n", hr); + return hr; + } + +unsupported: + if(outpwfx){ + hr = IAudioClient_GetMixFormat(&This->IAudioClient_iface, outpwfx); + if(FAILED(hr)) + return hr; + return S_FALSE; + } - TRACE("returning %08x\n", AUDCLNT_E_UNSUPPORTED_FORMAT); return AUDCLNT_E_UNSUPPORTED_FORMAT; }

1 0

Andrew Eikum : winealsa.drv: Improve IsFormatSupported handling.
by Alexandre Julliard Dec. 4, 2012

Dec. 4, 2012

Module: wine Branch: master Commit: 1d1aa7e8a14fe69aad145807d1f922b261a04b97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1aa7e8a14fe69aad145807d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 3 10:27:56 2012 -0600 winealsa.drv: Improve IsFormatSupported handling. --- dlls/winealsa.drv/mmdevdrv.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 9275fbc..6d86f55 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1230,6 +1230,12 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, if( duration < 3 * period) duration = 3 * period; }else{ + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask == 0 || + ((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask & SPEAKER_RESERVED) + return AUDCLNT_E_UNSUPPORTED_FORMAT; + } + if(!period) period = DefaultPeriod; /* not minimum */ if(period < MinimumPeriod || period > 5000000) @@ -1587,6 +1593,15 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, out = NULL; } + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + (fmt->nAvgBytesPerSec == 0 || + fmt->nBlockAlign == 0 || + ((WAVEFORMATEXTENSIBLE*)fmt)->Samples.wValidBitsPerSample > fmt->wBitsPerSample)) + return E_INVALIDARG; + + if(fmt->nChannels == 0) + return AUDCLNT_E_UNSUPPORTED_FORMAT; + EnterCriticalSection(&This->lock); if((err = snd_pcm_hw_params_any(This->pcm_handle, This->hw_params)) < 0){ @@ -1664,6 +1679,19 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, if(closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE) ((WAVEFORMATEXTENSIBLE*)closest)->dwChannelMask = get_channel_mask(closest->nChannels); + if(fmt->nBlockAlign != fmt->nChannels * fmt->wBitsPerSample / 8 || + fmt->nAvgBytesPerSec != fmt->nBlockAlign * fmt->nSamplesPerSec || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + ((WAVEFORMATEXTENSIBLE*)fmt)->Samples.wValidBitsPerSample < fmt->wBitsPerSample)) + hr = S_FALSE; + + if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE && + fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask == 0 || + ((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask & SPEAKER_RESERVED) + hr = S_FALSE; + } + exit: LeaveCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, formats); @@ -1676,6 +1704,8 @@ exit: closest->nChannels * closest->wBitsPerSample / 8; closest->nAvgBytesPerSec = closest->nBlockAlign * closest->nSamplesPerSec; + if(closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + ((WAVEFORMATEXTENSIBLE*)closest)->Samples.wValidBitsPerSample = closest->wBitsPerSample; *out = closest; } else CoTaskMemFree(closest);

1 0

Andrew Eikum : wineoss.drv: Improve IsFormatSupported handling.
by Alexandre Julliard Dec. 4, 2012

Dec. 4, 2012

Module: wine Branch: master Commit: dc0cef3d3b68ae10c80c13846265a9317eecdfd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0cef3d3b68ae10c80c13846… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 3 10:28:11 2012 -0600 wineoss.drv: Improve IsFormatSupported handling. --- dlls/wineoss.drv/mmdevdrv.c | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 62ae7ca..9fc6f02 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -837,13 +837,12 @@ static WAVEFORMATEX *clone_format(const WAVEFORMATEX *fmt) return ret; } -static HRESULT setup_oss_device(int fd, const WAVEFORMATEX *fmt, - WAVEFORMATEX **out, BOOL query) +static HRESULT setup_oss_device(AUDCLNT_SHAREMODE mode, int fd, + const WAVEFORMATEX *fmt, WAVEFORMATEX **out) { int tmp, oss_format; double tenth; HRESULT ret = S_OK; - WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; WAVEFORMATEX *closest = NULL; tmp = oss_format = get_oss_format(fmt); @@ -858,6 +857,15 @@ static HRESULT setup_oss_device(int fd, const WAVEFORMATEX *fmt, return AUDCLNT_E_UNSUPPORTED_FORMAT; } + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + (fmt->nAvgBytesPerSec == 0 || + fmt->nBlockAlign == 0 || + ((WAVEFORMATEXTENSIBLE*)fmt)->Samples.wValidBitsPerSample > fmt->wBitsPerSample)) + return E_INVALIDARG; + + if(fmt->nChannels == 0) + return AUDCLNT_E_UNSUPPORTED_FORMAT; + closest = clone_format(fmt); if(!closest) return E_OUTOFMEMORY; @@ -885,14 +893,19 @@ static HRESULT setup_oss_device(int fd, const WAVEFORMATEX *fmt, closest->nChannels = tmp; } - if(closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ - DWORD mask = get_channel_mask(closest->nChannels); + if(closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + ((WAVEFORMATEXTENSIBLE*)closest)->dwChannelMask = get_channel_mask(closest->nChannels); - ((WAVEFORMATEXTENSIBLE*)closest)->dwChannelMask = mask; + if(fmt->nBlockAlign != fmt->nChannels * fmt->wBitsPerSample / 8 || + fmt->nAvgBytesPerSec != fmt->nBlockAlign * fmt->nSamplesPerSec || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + ((WAVEFORMATEXTENSIBLE*)fmt)->Samples.wValidBitsPerSample < fmt->wBitsPerSample)) + ret = S_FALSE; - if(query && fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - fmtex->dwChannelMask != 0 && - fmtex->dwChannelMask != mask) + if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE && + fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask == 0 || + ((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask & SPEAKER_RESERVED) ret = S_FALSE; } @@ -904,6 +917,8 @@ static HRESULT setup_oss_device(int fd, const WAVEFORMATEX *fmt, closest->nChannels * closest->wBitsPerSample / 8; closest->nAvgBytesPerSec = closest->nBlockAlign * closest->nSamplesPerSec; + if(closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + ((WAVEFORMATEXTENSIBLE*)closest)->Samples.wValidBitsPerSample = closest->wBitsPerSample; *out = closest; } else CoTaskMemFree(closest); @@ -1055,7 +1070,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } - hr = setup_oss_device(This->fd, fmt, NULL, FALSE); + hr = setup_oss_device(mode, This->fd, fmt, NULL); if(FAILED(hr)){ LeaveCriticalSection(&This->lock); return hr; @@ -1237,7 +1252,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, return AUDCLNT_E_DEVICE_INVALIDATED; } - ret = setup_oss_device(fd, pwfx, outpwfx, TRUE); + ret = setup_oss_device(mode, fd, pwfx, outpwfx); close(fd);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Dec. 4, 2012

Dec. 4, 2012

Module: wine Branch: master Commit: a769e4aeb07a9609ae435f542d4044801e19a920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a769e4aeb07a9609ae435f542… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Dec 3 22:11:47 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 2434660..3607e91 100644 --- a/po/lt.po +++ b/po/lt.po @@ -641,11 +641,11 @@ msgstr "Kryptis" #: comdlg32.rc:318 view.rc:39 msgid "&Up" -msgstr "&Žemyn" +msgstr "&Aukštyn" #: comdlg32.rc:319 view.rc:40 msgid "&Down" -msgstr "&Aukštyn" +msgstr "&Žemyn" #: comdlg32.rc:321 comdlg32.rc:339 msgid "&Find Next" @@ -12424,11 +12424,11 @@ msgstr "&Sutalpinti į langą" #: view.rc:37 msgid "&Left" -msgstr "&Dešinėn" +msgstr "&Kairėn" #: view.rc:38 msgid "&Right" -msgstr "&Kairėn" +msgstr "&Dešinėn" #: view.rc:46 msgid "Regular Metafile Viewer"

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_GSSetConstantBuffers().
by Alexandre Julliard Dec. 4, 2012

Dec. 4, 2012

Module: wine Branch: master Commit: feda45279ee8bf77ac3440a77117474eec512711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feda45279ee8bf77ac3440a77… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 3 21:16:33 2012 +0100 d3d10core: Implement d3d10_device_GSSetConstantBuffers(). --- dlls/d3d10core/device.c | 13 ++++++++++++- dlls/wined3d/device.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/stateblock.c | 9 +++++++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 + 6 files changed, 63 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 25439b0..fbebf9e 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -271,8 +271,19 @@ static void STDMETHODCALLTYPE d3d10_device_DrawInstanced(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_GSSetConstantBuffers(ID3D10Device *iface, UINT start_slot, UINT buffer_count, ID3D10Buffer *const *buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + for (i = 0; i < buffer_count; ++i) + { + struct d3d10_buffer *buffer = unsafe_impl_from_ID3D10Buffer(buffers[i]); + + wined3d_device_set_gs_cb(device->wined3d_device, start_slot + i, + buffer ? buffer->wined3d_buffer : NULL); + } } static void STDMETHODCALLTYPE d3d10_device_GSSetShader(ID3D10Device *iface, ID3D10GeometryShader *shader) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 57e1de9..6ea2f85 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3129,6 +3129,45 @@ struct wined3d_shader * CDECL wined3d_device_get_geometry_shader(const struct wi return device->stateBlock->state.geometry_shader; } +void CDECL wined3d_device_set_gs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer) +{ + struct wined3d_buffer *prev; + + TRACE("device %p, idx %u, buffer %p.\n", device, idx, buffer); + + if (idx >= MAX_CONSTANT_BUFFERS) + { + WARN("Invalid constant buffer index %u.\n", idx); + return; + } + + prev = device->updateStateBlock->state.gs_cb[idx]; + device->updateStateBlock->state.gs_cb[idx] = buffer; + + if (device->isRecordingState) + { + if (buffer) + wined3d_buffer_incref(buffer); + if (prev) + wined3d_buffer_decref(prev); + return; + } + + if (prev != buffer) + { + if (buffer) + { + InterlockedIncrement(&buffer->resource.bind_count); + wined3d_buffer_incref(buffer); + } + if (prev) + { + InterlockedDecrement(&prev->resource.bind_count); + wined3d_buffer_decref(prev); + } + } +} + /* Context activation is done by the caller. */ /* Do not call while under the GL lock. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 11d8fa8..6499877 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -536,6 +536,15 @@ void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) wined3d_shader_decref(shader); } + for (i = 0; i < MAX_CONSTANT_BUFFERS; ++i) + { + if ((buffer = state->gs_cb[i])) + { + state->gs_cb[i] = NULL; + wined3d_buffer_decref(buffer); + } + } + if ((shader = state->pixel_shader)) { state->pixel_shader = NULL; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index b7b04df..d08c33f 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -116,6 +116,7 @@ @ cdecl wined3d_device_set_dialog_box_mode(ptr long) @ cdecl wined3d_device_set_gamma_ramp(ptr long long ptr) @ cdecl wined3d_device_set_geometry_shader(ptr ptr) +@ cdecl wined3d_device_set_gs_cb(ptr long ptr) @ cdecl wined3d_device_set_index_buffer(ptr ptr long) @ cdecl wined3d_device_set_light(ptr long ptr) @ cdecl wined3d_device_set_light_enable(ptr long long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ddf1fa2..4d7d456 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2306,6 +2306,7 @@ struct wined3d_state float *vs_consts_f; struct wined3d_shader *geometry_shader; + struct wined3d_buffer *gs_cb[MAX_CONSTANT_BUFFERS]; struct wined3d_shader *pixel_shader; BOOL ps_consts_b[MAX_CONST_B]; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7b1e043..206c8ef 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2206,6 +2206,7 @@ HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp); void __cdecl wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader); +void __cdecl wined3d_device_set_gs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer); void __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id); HRESULT __cdecl wined3d_device_set_light(struct wined3d_device *device,

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_GSGetConstantBuffers().
by Alexandre Julliard Dec. 4, 2012

Dec. 4, 2012

Module: wine Branch: master Commit: d906c94382b9ace2c1206b6b3c2e63b2fb29a70c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d906c94382b9ace2c1206b6b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 3 21:16:34 2012 +0100 d3d10core: Implement d3d10_device_GSGetConstantBuffers(). --- dlls/d3d10core/device.c | 21 ++++++++++++++++++++- dlls/wined3d/device.c | 13 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index fbebf9e..438beb0 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -669,8 +669,27 @@ static void STDMETHODCALLTYPE d3d10_device_IAGetIndexBuffer(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_GSGetConstantBuffers(ID3D10Device *iface, UINT start_slot, UINT buffer_count, ID3D10Buffer **buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + for (i = 0; i < buffer_count; ++i) + { + struct wined3d_buffer *wined3d_buffer; + struct d3d10_buffer *buffer_impl; + + if (!(wined3d_buffer = wined3d_device_get_gs_cb(device->wined3d_device, start_slot + i))) + { + buffers[i] = NULL; + continue; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + buffers[i] = &buffer_impl->ID3D10Buffer_iface; + ID3D10Buffer_AddRef(buffers[i]); + } } static void STDMETHODCALLTYPE d3d10_device_GSGetShader(ID3D10Device *iface, ID3D10GeometryShader **shader) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6ea2f85..c293636 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3168,6 +3168,19 @@ void CDECL wined3d_device_set_gs_cb(struct wined3d_device *device, UINT idx, str } } +struct wined3d_buffer * CDECL wined3d_device_get_gs_cb(const struct wined3d_device *device, UINT idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + if (idx >= MAX_CONSTANT_BUFFERS) + { + WARN("Invalid constant buffer index %u.\n", idx); + return NULL; + } + + return device->stateBlock->state.gs_cb[idx]; +} + /* Context activation is done by the caller. */ /* Do not call while under the GL lock. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d08c33f..c97e7af 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -66,6 +66,7 @@ @ cdecl wined3d_device_get_front_buffer_data(ptr long ptr) @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) @ cdecl wined3d_device_get_geometry_shader(ptr) +@ cdecl wined3d_device_get_gs_cb(ptr long) @ cdecl wined3d_device_get_index_buffer(ptr ptr) @ cdecl wined3d_device_get_light(ptr long ptr) @ cdecl wined3d_device_get_light_enable(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 206c8ef..82287df 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2127,6 +2127,7 @@ HRESULT __cdecl wined3d_device_get_front_buffer_data(const struct wined3d_device void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); struct wined3d_shader * __cdecl wined3d_device_get_geometry_shader(const struct wined3d_device *device); +struct wined3d_buffer * __cdecl wined3d_device_get_gs_cb(const struct wined3d_device *device, UINT idx); struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, enum wined3d_format_id *format); HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device,

1 0