wine-commits February 2019

wine-commits@winehq.org

1 participants
672 discussions

Zebediah Figura : quartz/filesource: Return a default media type from FileAsyncReaderPin_GetMediaType().
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: 529af770510a2354dfd31f20e57a285dbc703d8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=529af770510a2354dfd31f20… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 21 18:42:58 2019 -0600 quartz/filesource: Return a default media type from FileAsyncReaderPin_GetMediaType(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 39 ++++++++++++++++++++++------------- dlls/quartz/tests/filesource.c | 46 +++++++++++++++++------------------------- 2 files changed, 44 insertions(+), 41 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 44794df..6b8bfa3 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -37,6 +37,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); static const WCHAR wszOutputPinName[] = { 'O','u','t','p','u','t',0 }; +static const AM_MEDIA_TYPE default_mt = +{ + {0xe436eb83,0x524f,0x11ce,{0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70}}, /* MEDIATYPE_Stream */ + {0,0,0,{0,0,0,0,0,0,0,0}}, + TRUE, + FALSE, + 1, + {0,0,0,{0,0,0,0,0,0,0,0}}, + NULL, + 0, + NULL +}; + typedef struct AsyncReader { BaseFilter filter; @@ -618,19 +631,11 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi This->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); if (!pmt) { - This->pmt->bFixedSizeSamples = TRUE; - This->pmt->bTemporalCompression = FALSE; - This->pmt->cbFormat = 0; - This->pmt->pbFormat = NULL; - This->pmt->pUnk = NULL; - This->pmt->lSampleSize = 1; - This->pmt->formattype = GUID_NULL; - hr = GetClassMediaFile(pReader, pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL); - if (FAILED(hr)) + CopyMediaType(This->pmt, &default_mt); + if (FAILED(GetClassMediaFile(pReader, pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL))) { This->pmt->majortype = MEDIATYPE_Stream; This->pmt->subtype = MEDIASUBTYPE_NULL; - hr = S_OK; } } else @@ -763,14 +768,20 @@ static HRESULT WINAPI FileAsyncReaderPin_CheckMediaType(BasePin *pin, const AM_M return S_FALSE; } -static HRESULT WINAPI FileAsyncReaderPin_GetMediaType(BasePin *iface, int iPosition, AM_MEDIA_TYPE *pmt) +static HRESULT WINAPI FileAsyncReaderPin_GetMediaType(BasePin *iface, int index, AM_MEDIA_TYPE *mt) { FileAsyncReader *This = impl_from_BasePin(iface); - if (iPosition < 0) + AsyncReader *filter = impl_from_IBaseFilter(This->pin.pin.pinInfo.pFilter); + + if (index < 0) return E_INVALIDARG; - if (iPosition > 0) + else if (index > 1) return VFW_S_NO_MORE_ITEMS; - CopyMediaType(pmt, impl_from_IBaseFilter(This->pin.pin.pinInfo.pFilter)->pmt); + + if (index == 0) + CopyMediaType(mt, filter->pmt); + else if (index == 1) + CopyMediaType(mt, &default_mt); return S_OK; } diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 2e287f7..7330a83 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -257,15 +257,11 @@ static void test_file_source_filter(void) CoTaskMemFree(pmt); hr = IEnumMediaTypes_Next(enum_mt, 1, &pmt, NULL); -todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - mt = file_mt; - mt.subtype = GUID_NULL; - ok(!memcmp(pmt, &mt, sizeof(*pmt)), "Media types did not match.\n"); - CoTaskMemFree(pmt); - } + mt = file_mt; + mt.subtype = GUID_NULL; + ok(!memcmp(pmt, &mt, sizeof(*pmt)), "Media types did not match.\n"); + CoTaskMemFree(pmt); hr = IEnumMediaTypes_Next(enum_mt, 1, &pmt, NULL); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -339,26 +335,22 @@ todo_wine CoTaskMemFree(pmt); hr = IEnumMediaTypes_Next(enum_mt, 1, &pmt, NULL); -todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Stream), "Got major type %s.\n", - wine_dbgstr_guid(&pmt->majortype)); - ok(IsEqualGUID(&pmt->subtype, &GUID_NULL), "Got subtype %s.\n", - wine_dbgstr_guid(&pmt->subtype)); - ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); - ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); - ok(pmt->lSampleSize == 1, "Got sample size %u.\n", pmt->lSampleSize); - ok(IsEqualGUID(&pmt->formattype, &GUID_NULL), "Got format type %s.\n", - wine_dbgstr_guid(&pmt->formattype)); - ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); - ok(!pmt->cbFormat, "Got format size %#x.\n", pmt->cbFormat); - ok(!pmt->pbFormat, "Got format %p.\n", pmt->pbFormat); - - hr = IPin_QueryAccept(pin, pmt); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); - } + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Stream), "Got major type %s.\n", + wine_dbgstr_guid(&pmt->majortype)); + ok(IsEqualGUID(&pmt->subtype, &GUID_NULL), "Got subtype %s.\n", + wine_dbgstr_guid(&pmt->subtype)); + ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + ok(pmt->lSampleSize == 1, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &GUID_NULL), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + ok(!pmt->cbFormat, "Got format size %#x.\n", pmt->cbFormat); + ok(!pmt->pbFormat, "Got format %p.\n", pmt->pbFormat); + + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IEnumMediaTypes_Next(enum_mt, 1, &pmt, NULL); ok(hr == S_FALSE, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : quartz/filesource: Correctly initialize the default media type.
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: a67ad095280b882f0293277003eacc2003567f0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a67ad095280b882f02932770… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 21 18:42:57 2019 -0600 quartz/filesource: Correctly initialize the default media type. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 4 ++-- dlls/quartz/tests/filesource.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index ab8d645..44794df 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -623,8 +623,8 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi This->pmt->cbFormat = 0; This->pmt->pbFormat = NULL; This->pmt->pUnk = NULL; - This->pmt->lSampleSize = 0; - This->pmt->formattype = FORMAT_None; + This->pmt->lSampleSize = 1; + This->pmt->formattype = GUID_NULL; hr = GetClassMediaFile(pReader, pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL); if (FAILED(hr)) { diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 845e74d..2e287f7 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -237,11 +237,9 @@ static void test_file_source_filter(void) ok(file_mt.bFixedSizeSamples == TRUE, "Got fixed size %d.\n", file_mt.bFixedSizeSamples); ok(file_mt.bTemporalCompression == FALSE, "Got temporal compression %d.\n", file_mt.bTemporalCompression); -todo_wine { ok(file_mt.lSampleSize == 1, "Got sample size %u.\n", file_mt.lSampleSize); ok(IsEqualGUID(&file_mt.formattype, &GUID_NULL), "Got format type %s.\n", wine_dbgstr_guid(&file_mt.formattype)); -} ok(!file_mt.pUnk, "Got pUnk %p.\n", file_mt.pUnk); ok(!file_mt.cbFormat, "Got format size %#x.\n", file_mt.cbFormat); ok(!file_mt.pbFormat, "Got format %p.\n", file_mt.pbFormat);

1 0

Zhiyi Zhang : kernelbase/tests: Fix a possible test failure.
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: 397c15ab77bf3c0afd1fff9813ee16d62230db61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=397c15ab77bf3c0afd1fff98… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 22 10:35:09 2019 +0800 kernelbase/tests: Fix a possible test failure. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/path.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 7644c31..b5da303 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -1035,6 +1035,7 @@ static void test_PathCchCanonicalize(void) ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); } + path_inW[0] = 0; hr = pPathCchCanonicalize(path_outW, 0, path_inW); ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr);

1 0

Michael Stefaniuc : kernelbase: Remove redundant not-NULL check ( coccinellery).
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: e441d882620ae73e895b6af2e5134b84a7ae52b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e441d882620ae73e895b6af2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 22 10:41:41 2019 +0800 kernelbase: Remove redundant not-NULL check (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index dfcc825..3eefcd7 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -326,7 +326,7 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl if (!path1 || !path2) return PathAllocCanonicalize(path1 ? path1 : path2, flags, out); /* If path2 is fully qualified, use path2 only */ - if (path2 && ((isalphaW(path2[0]) && path2[1] == ':') || (path2[0] == '\\' && path2[1] == '\\'))) + if ((isalphaW(path2[0]) && path2[1] == ':') || (path2[0] == '\\' && path2[1] == '\\')) { path1 = path2; path2 = NULL;

1 0

Michael Stefaniuc : wintrust: Remove redundant not-NULL checks ( coccinellery).
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: 2b8d9764ea4aa50c7b4091385df8f9562ffe0ca5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b8d9764ea4aa50c7b409138… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 21 20:35:35 2019 +0100 wintrust: Remove redundant not-NULL checks (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/wintrust_main.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 58e3ac3..7db0b47 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -309,13 +309,11 @@ static LONG WINTRUST_DefaultVerify(HWND hwnd, GUID *actionID, goto done; error: - if (provData) - { - WINTRUST_Free(provData->padwTrustStepErrors); - WINTRUST_Free(provData->u.pPDSip); - WINTRUST_Free(provData->psPfns); - WINTRUST_Free(provData); - } + WINTRUST_Free(provData->padwTrustStepErrors); + WINTRUST_Free(provData->u.pPDSip); + WINTRUST_Free(provData->psPfns); + WINTRUST_Free(provData); + done: TRACE("returning %08x\n", err); return err; @@ -502,13 +500,11 @@ static LONG WINTRUST_CertVerify(HWND hwnd, GUID *actionID, goto done; error: - if (provData) - { - WINTRUST_Free(provData->padwTrustStepErrors); - WINTRUST_Free(provData->u.pPDSip); - WINTRUST_Free(provData->psPfns); - WINTRUST_Free(provData); - } + WINTRUST_Free(provData->padwTrustStepErrors); + WINTRUST_Free(provData->u.pPDSip); + WINTRUST_Free(provData->psPfns); + WINTRUST_Free(provData); + done: TRACE("returning %08x\n", err); return err;

1 0

Michael Stefaniuc : comctl32: Avoid using the comma operator.
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: e4f66b0483cdb37f069ea64eb666d19c62a89b84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4f66b0483cdb37f069ea64e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 21 20:35:33 2019 +0100 comctl32: Avoid using the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 4 ++-- dlls/comctl32/listbox.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 3e30673..9a6ea3b 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1002,7 +1002,7 @@ ImageList_InternalDragDraw (HDC hdc, INT x, INT y) imldp.cbSize = sizeof(imldp); imldp.himl = InternalDrag.himl; imldp.i = 0; - imldp.hdcDst = hdc, + imldp.hdcDst = hdc; imldp.x = x; imldp.y = y; imldp.rgbBk = CLR_DEFAULT; @@ -1236,7 +1236,7 @@ ImageList_DrawEx (HIMAGELIST himl, INT i, HDC hdc, INT x, INT y, imldp.cbSize = sizeof(imldp); imldp.himl = himl; imldp.i = i; - imldp.hdcDst = hdc, + imldp.hdcDst = hdc; imldp.x = x; imldp.y = y; imldp.cx = dx; diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index cbe57f2..180c09b 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1173,7 +1173,7 @@ static void LISTBOX_NCPaint( LB_DESCR *descr, HRGN region ) if (!theme || !(exstyle & WS_EX_CLIENTEDGE)) return; - cxEdge = GetSystemMetrics(SM_CXEDGE), + cxEdge = GetSystemMetrics(SM_CXEDGE); cyEdge = GetSystemMetrics(SM_CYEDGE); GetWindowRect(descr->self, &r);

1 0

Michael Stefaniuc : ntdll: Remove redundant not-NULL check (coccinellery).
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: 244c15fe7b253841c60090d08d6cb489cef2ea18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=244c15fe7b253841c60090d0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 21 20:35:38 2019 +0100 ntdll: Remove redundant not-NULL check (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index c86ca88..76dc6c2 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2712,7 +2712,7 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T { *addr_ptr = wine_server_get_ptr( result.virtual_protect.addr ); *size_ptr = result.virtual_protect.size; - if (old_prot) *old_prot = result.virtual_protect.prot; + *old_prot = result.virtual_protect.prot; } return result.virtual_protect.status; }

1 0

Michael Stefaniuc : oledb32: Remove redundant not-NULL check (coccinellery ).
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: 45553a97b06be46548b2617818c26544b5dea432 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45553a97b06be46548b26178… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 21 20:35:39 2019 +0100 oledb32: Remove redundant not-NULL check (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/rowpos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index 46904d3..c922f93 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -416,7 +416,7 @@ static HRESULT WINAPI rowpos_cp_Advise(IConnectionPoint *iface, IUnknown *unksin } This->sinks[i] = sink; - if (cookie) *cookie = i + 1; + *cookie = i + 1; return S_OK; }

1 0

Zebediah Figura : wined3d: Rename MAX_COMBINED_SAMPLERS to WINED3D_MAX_COMBINED_SAMPLERS.
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: 6bf349fc7cae0aa253f8131228ddadb5d60e472f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bf349fc7cae0aa253f81312… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 20 14:54:00 2019 -0600 wined3d: Rename MAX_COMBINED_SAMPLERS to WINED3D_MAX_COMBINED_SAMPLERS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/cs.c | 2 +- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/stateblock.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 22 +++++++++++----------- 5 files changed, 25 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6bf349fc7cae0aa253f8…

1 0

Zebediah Figura : wined3d: Rename MAX_VERTEX_SAMPLERS to WINED3D_MAX_VERTEX_SAMPLERS.
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: 8a1e746ffb98b2e4679f518dc0f6a3f30470cde7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a1e746ffb98b2e4679f518d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 20 14:53:59 2019 -0600 wined3d: Rename MAX_VERTEX_SAMPLERS to WINED3D_MAX_VERTEX_SAMPLERS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 58ecc87..42dcd2e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2036,12 +2036,12 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, } wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, WINED3D_SHADER_TYPE_VERTEX, &base, &count); - if (base + MAX_VERTEX_SAMPLERS > ARRAY_SIZE(context->rev_tex_unit_map)) + if (base + WINED3D_MAX_VERTEX_SAMPLERS > ARRAY_SIZE(context->rev_tex_unit_map)) { ERR("Unexpected texture unit base index %u.\n", base); return FALSE; } - for (i = 0; i < min(count, MAX_VERTEX_SAMPLERS); ++i) + for (i = 0; i < min(count, WINED3D_MAX_VERTEX_SAMPLERS); ++i) { context->tex_unit_map[WINED3D_MAX_FRAGMENT_SAMPLERS + i] = base + i; context->rev_tex_unit_map[base + i] = WINED3D_MAX_FRAGMENT_SAMPLERS + i; @@ -2368,7 +2368,7 @@ const DWORD *context_get_tex_unit_mapping(const struct wined3d_context *context, break; case WINED3D_SHADER_TYPE_VERTEX: *base = WINED3D_MAX_FRAGMENT_SAMPLERS; - *count = MAX_VERTEX_SAMPLERS; + *count = WINED3D_MAX_VERTEX_SAMPLERS; break; default: ERR("Unhandled shader type %#x.\n", shader_version->type); @@ -3416,7 +3416,7 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons if (ps) ps_resource_info = state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.resource_info; - for (i = 0; i < MAX_VERTEX_SAMPLERS; ++i) + for (i = 0; i < WINED3D_MAX_VERTEX_SAMPLERS; ++i) { DWORD vsampler_idx = i + WINED3D_MAX_FRAGMENT_SAMPLERS; if (vs_resource_info[i].type) @@ -3729,7 +3729,7 @@ static void context_preload_textures(struct wined3d_context *context, const stru if (use_vs(state)) { - for (i = 0; i < MAX_VERTEX_SAMPLERS; ++i) + for (i = 0; i < WINED3D_MAX_VERTEX_SAMPLERS; ++i) { if (state->shader[WINED3D_SHADER_TYPE_VERTEX]->reg_maps.resource_info[i].type) context_preload_texture(context, state, WINED3D_MAX_FRAGMENT_SAMPLERS + i); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6d52791..770ba5f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -261,8 +261,8 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup #define WINED3D_MAX_STREAMS 16 #define WINED3D_MAX_TEXTURES 8 #define WINED3D_MAX_FRAGMENT_SAMPLERS 16 -#define MAX_VERTEX_SAMPLERS 4 -#define MAX_COMBINED_SAMPLERS (WINED3D_MAX_FRAGMENT_SAMPLERS + MAX_VERTEX_SAMPLERS) +#define WINED3D_MAX_VERTEX_SAMPLERS 4 +#define MAX_COMBINED_SAMPLERS (WINED3D_MAX_FRAGMENT_SAMPLERS + WINED3D_MAX_VERTEX_SAMPLERS) #define MAX_ACTIVE_LIGHTS 8 #define MAX_CLIP_DISTANCES 8 #define MAX_CONSTANT_BUFFERS 15 @@ -1996,7 +1996,7 @@ struct wined3d_context GLuint blit_vbo; DWORD tex_unit_map[MAX_COMBINED_SAMPLERS]; - DWORD rev_tex_unit_map[MAX_GL_FRAGMENT_SAMPLERS + MAX_VERTEX_SAMPLERS]; + DWORD rev_tex_unit_map[MAX_GL_FRAGMENT_SAMPLERS + WINED3D_MAX_VERTEX_SAMPLERS]; /* Extension emulation */ GLint gl_fog_source;

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2019