wine-commits September 2018

wine-commits@winehq.org

2 participants
670 discussions

Alistair Leslie-Hughes : mfplat: Add MFTUnregisterLocal stub.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: d7d07929f2caf83523875d608798d0c265f86258 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7d07929f2caf83523875d60… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 7 00:58:38 2018 +0000 mfplat: Add MFTUnregisterLocal stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 7 +++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c5c8ad8..c36a5ef 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -240,6 +240,13 @@ HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWST return S_OK; } +HRESULT WINAPI MFTUnregisterLocal(IClassFactory *factory) +{ + FIXME("(%p)\n", factory); + + return S_OK; +} + static BOOL match_type(const WCHAR *clsid_str, const WCHAR *type_str, MFT_REGISTER_TYPE_INFO *type) { HKEY htransform, hfilter; diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c143814..1b33e2d 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -141,7 +141,7 @@ @ stub MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) @ stub MFTRegisterLocalByCLSID @ stdcall MFTUnregister(int128) -@ stub MFTUnregisterLocal +@ stdcall MFTUnregisterLocal(ptr) @ stub MFTUnregisterLocalByCLSID @ stub MFTraceError @ stub MFTraceFuncEnter diff --git a/include/mfapi.h b/include/mfapi.h index f889840..890d7bd 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -85,6 +85,7 @@ HRESULT WINAPI MFShutdown(void); HRESULT WINAPI MFStartup(ULONG version, DWORD flags); HRESULT WINAPI MFUnlockPlatform(void); HRESULT WINAPI MFTUnregister(CLSID clsid); +HRESULT WINAPI MFTUnregisterLocal(IClassFactory *factory); HRESULT WINAPI MFGetPluginControl(IMFPluginControl**); #endif /* __WINE_MFAPI_H */

1 0

Alistair Leslie-Hughes : mfplat: Add MFTRegisterLocal stub.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: 5b8565d60760f17ecac7bccf9f2c4477943de544 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b8565d60760f17ecac7bccf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 7 00:58:37 2018 +0000 mfplat: Add MFTRegisterLocal stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45622 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 10 ++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index df61f3c..c5c8ad8 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -230,6 +230,16 @@ HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags return hr; } +HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWSTR name, + UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, + UINT32 coutput, const MFT_REGISTER_TYPE_INFO* output_types) +{ + FIXME("(%p, %s, %s, %x, %u, %p, %u, %p)\n", factory, debugstr_guid(category), debugstr_w(name), + flags, cinput, input_types, coutput, output_types); + + return S_OK; +} + static BOOL match_type(const WCHAR *clsid_str, const WCHAR *type_str, MFT_REGISTER_TYPE_INFO *type) { HKEY htransform, hfilter; diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index a66f4d1..c143814 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -138,7 +138,7 @@ @ stdcall MFTEnumEx(int128 long ptr ptr ptr ptr) @ stub MFTGetInfo @ stdcall MFTRegister(int128 int128 wstr long long ptr long ptr ptr) -@ stub MFTRegisterLocal +@ stub MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) @ stub MFTRegisterLocalByCLSID @ stdcall MFTUnregister(int128) @ stub MFTUnregisterLocal diff --git a/include/mfapi.h b/include/mfapi.h index 5aead1e..f889840 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -78,6 +78,9 @@ HRESULT WINAPI MFLockPlatform(void); HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags, UINT32 cinput, MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes); +HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWSTR name, + UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, + UINT32 coutput, const MFT_REGISTER_TYPE_INFO* output_types); HRESULT WINAPI MFShutdown(void); HRESULT WINAPI MFStartup(ULONG version, DWORD flags); HRESULT WINAPI MFUnlockPlatform(void);

1 0

André Hentschel : crypt32: Print Crypt(Un) protectMemory FIXME only once.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: 42c20ac0b838b351257b572db4d96fbfed7c7291 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42c20ac0b838b351257b572d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 9 14:35:18 2018 +0200 crypt32: Print Crypt(Un)protectMemory FIXME only once. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 9ff7592..79a0ce1 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -252,12 +252,14 @@ ASN1encoding_t WINAPI I_CryptGetAsn1Encoder(HCRYPTASN1MODULE x) BOOL WINAPI CryptProtectMemory(void *data, DWORD len, DWORD flags) { - FIXME("(%p %u %08x): stub\n", data, len, flags); + static int fixme_once; + if (!fixme_once++) FIXME("(%p %u %08x): stub\n", data, len, flags); return TRUE; } BOOL WINAPI CryptUnprotectMemory(void *data, DWORD len, DWORD flags) { - FIXME("(%p %u %08x): stub\n", data, len, flags); + static int fixme_once; + if (!fixme_once++) FIXME("(%p %u %08x): stub\n", data, len, flags); return TRUE; }

1 0

André Hentschel : oleaut32/tests: Adjust test to a fixed Windows bug.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: 3b2c4d662440494ca53e3c0897036fcf80c13d71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b2c4d662440494ca53e3c08… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 9 14:35:21 2018 +0200 oleaut32/tests: Adjust test to a fixed Windows bug. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/safearray.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 5d54146..9cc3793 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -2018,9 +2018,10 @@ static void test_SafeArrayDestroyData (void) ok(hres == S_OK, "got 0x%08x\n", hres); todo_wine ok(sa->fFeatures == FADF_HAVEVARTYPE, "got 0x%x\n", sa->fFeatures); - ok(sa->pvData != NULL, "got %p\n", sa->pvData); - /* There seems to be a bug on windows, especially visible on 64bit systems, - probably double-free of similar issue. */ +todo_wine + ok(sa->pvData == NULL || broken(sa->pvData != NULL), "got %p\n", sa->pvData); + /* There was a bug on windows, especially visible on 64bit systems, + probably double-free or similar issue. */ sa->pvData = NULL; SafeArrayDestroy(sa); }

1 0

André Hentschel : kernel32/tests: Allow ERROR_ACCESS_DENIED for newer Win10.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: fa0da6a2cbedcdccc611fbd8feddec6c92c96bb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa0da6a2cbedcdccc611fbd8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 9 14:35:37 2018 +0200 kernel32/tests: Allow ERROR_ACCESS_DENIED for newer Win10. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index e4d6741..e7a1a43 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -3163,7 +3163,8 @@ todo_wine if (!ret) ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_GEN_FAILURE /* win7 64-bit */ || - GetLastError() == ERROR_INVALID_FUNCTION /* vista 64-bit */, + GetLastError() == ERROR_INVALID_FUNCTION /* vista 64-bit */ || + GetLastError() == ERROR_ACCESS_DENIED /* Win10 32-bit */, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ctx.ContextFlags = CONTEXT_INTEGER; @@ -3186,7 +3187,8 @@ todo_wine if (!ret) ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_GEN_FAILURE /* win7 64-bit */ || - GetLastError() == ERROR_INVALID_FUNCTION /* vista 64-bit */, + GetLastError() == ERROR_INVALID_FUNCTION /* vista 64-bit */ || + GetLastError() == ERROR_ACCESS_DENIED /* Win10 32-bit */, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ctx.ContextFlags = CONTEXT_INTEGER;

1 0

André Hentschel : advapi32/tests: Allow ERROR_ACCESS_DENIED for newer Win10.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: 56885a1ca99b03c2395b2a555ed5e6fca4ad7178 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56885a1ca99b03c2395b2a55… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 9 14:35:28 2018 +0200 advapi32/tests: Allow ERROR_ACCESS_DENIED for newer Win10. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index aebf3b8..3ca151d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3149,8 +3149,8 @@ static void test_impersonation_level(void) /* can't perform access check when opening object against an identification impersonation token */ error = RegOpenKeyExA(HKEY_CURRENT_USER, "Software", 0, KEY_READ, &hkey); todo_wine { - ok(error == ERROR_INVALID_HANDLE || error == ERROR_BAD_IMPERSONATION_LEVEL, - "RegOpenKeyEx should have failed with ERROR_INVALID_HANDLE or ERROR_BAD_IMPERSONATION_LEVEL instead of %d\n", error); + ok(error == ERROR_INVALID_HANDLE || error == ERROR_BAD_IMPERSONATION_LEVEL || error == ERROR_ACCESS_DENIED, + "RegOpenKeyEx should have failed with ERROR_INVALID_HANDLE, ERROR_BAD_IMPERSONATION_LEVEL or ERROR_ACCESS_DENIED instead of %d\n", error); } ret = PrivilegeCheck(Token, PrivilegeSet, &AccessGranted); ok(ret, "PrivilegeCheck for SecurityIdentification failed with error %d\n", GetLastError());

1 0

Henri Verbeet : wined3d: Derive format component counts from the component info.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: 19a532ca0abbd288340f05e032794bb0a7f16120 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19a532ca0abbd288340f05e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 10 01:20:48 2018 +0430 wined3d: Derive format component counts from the component info. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 76 ++++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 40 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1b13c99..54b7bce 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -600,48 +600,47 @@ struct wined3d_format_vertex_info { enum wined3d_format_id id; enum wined3d_ffp_emit_idx emit_idx; - unsigned int component_count; GLenum gl_vtx_type; enum wined3d_gl_extension extension; }; static const struct wined3d_format_vertex_info format_vertex_info[] = { - {WINED3DFMT_R32_FLOAT, WINED3D_FFP_EMIT_FLOAT1, 1, GL_FLOAT}, - {WINED3DFMT_R32G32_FLOAT, WINED3D_FFP_EMIT_FLOAT2, 2, GL_FLOAT}, - {WINED3DFMT_R32G32B32_FLOAT, WINED3D_FFP_EMIT_FLOAT3, 3, GL_FLOAT}, - {WINED3DFMT_R32G32B32A32_FLOAT, WINED3D_FFP_EMIT_FLOAT4, 4, GL_FLOAT}, - {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_FFP_EMIT_D3DCOLOR, 4, GL_UNSIGNED_BYTE}, - {WINED3DFMT_R8G8B8A8_UINT, WINED3D_FFP_EMIT_UBYTE4, 4, GL_UNSIGNED_BYTE}, - {WINED3DFMT_R16G16_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_SHORT}, - {WINED3DFMT_R16G16_SINT, WINED3D_FFP_EMIT_SHORT2, 2, GL_SHORT}, - {WINED3DFMT_R16G16B16A16_SINT, WINED3D_FFP_EMIT_SHORT4, 4, GL_SHORT}, - {WINED3DFMT_R8G8B8A8_UNORM, WINED3D_FFP_EMIT_UBYTE4N, 4, GL_UNSIGNED_BYTE}, - {WINED3DFMT_R16G16_SNORM, WINED3D_FFP_EMIT_SHORT2N, 2, GL_SHORT}, - {WINED3DFMT_R16G16B16A16_SNORM, WINED3D_FFP_EMIT_SHORT4N, 4, GL_SHORT}, - {WINED3DFMT_R16G16_UNORM, WINED3D_FFP_EMIT_USHORT2N, 2, GL_UNSIGNED_SHORT}, - {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FFP_EMIT_USHORT4N, 4, GL_UNSIGNED_SHORT}, - {WINED3DFMT_R10G10B10X2_UINT, WINED3D_FFP_EMIT_UDEC3, 3, GL_UNSIGNED_SHORT}, - {WINED3DFMT_R10G10B10X2_SNORM, WINED3D_FFP_EMIT_DEC3N, 3, GL_SHORT}, - {WINED3DFMT_R10G10B10A2_UNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT_2_10_10_10_REV, + {WINED3DFMT_R32_FLOAT, WINED3D_FFP_EMIT_FLOAT1, GL_FLOAT}, + {WINED3DFMT_R32G32_FLOAT, WINED3D_FFP_EMIT_FLOAT2, GL_FLOAT}, + {WINED3DFMT_R32G32B32_FLOAT, WINED3D_FFP_EMIT_FLOAT3, GL_FLOAT}, + {WINED3DFMT_R32G32B32A32_FLOAT, WINED3D_FFP_EMIT_FLOAT4, GL_FLOAT}, + {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_FFP_EMIT_D3DCOLOR, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R8G8B8A8_UINT, WINED3D_FFP_EMIT_UBYTE4, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R16G16_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R16G16_SINT, WINED3D_FFP_EMIT_SHORT2, GL_SHORT}, + {WINED3DFMT_R16G16B16A16_SINT, WINED3D_FFP_EMIT_SHORT4, GL_SHORT}, + {WINED3DFMT_R8G8B8A8_UNORM, WINED3D_FFP_EMIT_UBYTE4N, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R16G16_SNORM, WINED3D_FFP_EMIT_SHORT2N, GL_SHORT}, + {WINED3DFMT_R16G16B16A16_SNORM, WINED3D_FFP_EMIT_SHORT4N, GL_SHORT}, + {WINED3DFMT_R16G16_UNORM, WINED3D_FFP_EMIT_USHORT2N, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FFP_EMIT_USHORT4N, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R10G10B10X2_UINT, WINED3D_FFP_EMIT_UDEC3, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R10G10B10X2_SNORM, WINED3D_FFP_EMIT_DEC3N, GL_SHORT}, + {WINED3DFMT_R10G10B10A2_UNORM, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT_2_10_10_10_REV, ARB_VERTEX_TYPE_2_10_10_10_REV}, - {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, 2, GL_HALF_FLOAT}, - {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, 4, GL_HALF_FLOAT}, - {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE}, - {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE}, - {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_SHORT}, - {WINED3DFMT_R8_UNORM, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_BYTE}, - {WINED3DFMT_R8_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_BYTE}, - {WINED3DFMT_R8_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_BYTE}, - {WINED3DFMT_R16_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_SHORT}, - {WINED3DFMT_R16_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_SHORT}, - {WINED3DFMT_R32_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_INT}, - {WINED3DFMT_R32_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_INT}, - {WINED3DFMT_R32G32_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_INT}, - {WINED3DFMT_R32G32_SINT, WINED3D_FFP_EMIT_INVALID, 2, GL_INT}, - {WINED3DFMT_R32G32B32_UINT, WINED3D_FFP_EMIT_INVALID, 3, GL_UNSIGNED_INT}, - {WINED3DFMT_R32G32B32A32_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT}, - {WINED3DFMT_R32G32B32A32_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_INT}, + {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, GL_HALF_FLOAT}, + {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, GL_HALF_FLOAT}, + {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, + {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, + {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R8_UNORM, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R8_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R8_SINT, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, + {WINED3DFMT_R16_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R16_SINT, WINED3D_FFP_EMIT_INVALID, GL_SHORT}, + {WINED3DFMT_R32_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT}, + {WINED3DFMT_R32_SINT, WINED3D_FFP_EMIT_INVALID, GL_INT}, + {WINED3DFMT_R32G32_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT}, + {WINED3DFMT_R32G32_SINT, WINED3D_FFP_EMIT_INVALID, GL_INT}, + {WINED3DFMT_R32G32B32_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT}, + {WINED3DFMT_R32G32B32A32_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT}, + {WINED3DFMT_R32G32B32A32_SINT, WINED3D_FFP_EMIT_INVALID, GL_INT}, }; struct wined3d_format_texture_info @@ -2038,6 +2037,7 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter) for (i = 0; i < ARRAY_SIZE(typed_formats); ++i) { const struct wined3d_format *typeless_format; + unsigned int component_count = 0; DWORD flags = 0; if (!(format = get_format_internal(adapter, typed_formats[i].id))) @@ -2073,6 +2073,8 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter) flags |= WINED3DFMT_FLAG_INTEGER; if (channel_type == WINED3D_CHANNEL_TYPE_FLOAT) flags |= WINED3DFMT_FLAG_FLOAT; + if (channel_type != WINED3D_CHANNEL_TYPE_UNUSED) + ++component_count; if (channel_type == WINED3D_CHANNEL_TYPE_DEPTH && !format->depth_size) { @@ -2081,6 +2083,7 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter) } } + format->component_count = component_count; format_set_flag(format, flags); } @@ -3683,9 +3686,8 @@ static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter, continue; format->emit_idx = format_vertex_info[i].emit_idx; - format->component_count = format_vertex_info[i].component_count; format->gl_vtx_type = format_vertex_info[i].gl_vtx_type; - format->gl_vtx_format = format_vertex_info[i].component_count; + format->gl_vtx_format = format->component_count; } return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 535023f..7c8beb8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4326,6 +4326,7 @@ struct wined3d_format enum wined3d_format_id id; D3DDDIFORMAT ddi_format; + unsigned int component_count; DWORD red_size; DWORD green_size; DWORD blue_size; @@ -4343,7 +4344,6 @@ struct wined3d_format UINT block_byte_count; enum wined3d_ffp_emit_idx emit_idx; - GLint component_count; GLenum gl_vtx_type; GLint gl_vtx_format;

1 0

Henri Verbeet : wined3d: Introduce WINED3DFMT_FLAG_NORMALISED.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: 9781ef76fac9ed61f0b9fe46c2a41290149eeb4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9781ef76fac9ed61f0b9fe46… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 10 01:20:47 2018 +0430 wined3d: Introduce WINED3DFMT_FLAG_NORMALISED. Derived from the component info. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 7 ++-- dlls/wined3d/utils.c | 73 +++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 42 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9781ef76fac9ed61f0b9…

1 0

Henri Verbeet : wined3d: Add component info for R10G10B10X2_SNORM and R10G10B10X2_UINT.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: 8ad9f777b81c513df0d895921eaaf9f187e60feb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ad9f777b81c513df0d89592… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 10 01:20:46 2018 +0430 wined3d: Add component info for R10G10B10X2_SNORM and R10G10B10X2_UINT. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 5 +++-- include/wine/wined3d.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 961e3fe..84410af 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -123,8 +123,6 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_R5G5_SNORM_L6_UNORM, 5, 5, 0, 0, 0, 5, 0, 0, 2, 0, 0}, {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, 8, 8, 0, 0, 0, 8, 0, 0, 4, 0, 0}, {WINED3DFMT_R10G11B11_SNORM, 10, 11, 11, 0, 0, 10, 21, 0, 4, 0, 0}, - {WINED3DFMT_R10G10B10X2_UINT, 10, 10, 10, 0, 0, 10, 20, 0, 4, 0, 0}, - {WINED3DFMT_R10G10B10X2_SNORM, 10, 10, 10, 0, 0, 10, 20, 0, 4, 0, 0}, {WINED3DFMT_R10G10B10_SNORM_A2_UNORM, 10, 10, 10, 2, 0, 10, 20, 30, 4, 0, 0}, /* Depth stencil formats */ {WINED3DFMT_D16_LOCKABLE, 0, 0, 0, 0, 0, 0, 0, 0, 2, 16, 0}, @@ -155,6 +153,7 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_R32G32_TYPELESS, 32, 32, 0, 0, 0, 32, 0, 0, 8, 0, 0}, {WINED3DFMT_R32G8X24_TYPELESS, 0, 0, 0, 0, 0, 0, 0, 0, 8, 32, 8}, {WINED3DFMT_R10G10B10A2_TYPELESS, 10, 10, 10, 2, 0, 10, 20, 30, 4, 0, 0}, + {WINED3DFMT_R10G10B10X2_TYPELESS, 10, 10, 10, 0, 0, 10, 20, 0, 4, 0, 0}, {WINED3DFMT_R8G8B8A8_TYPELESS, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, {WINED3DFMT_R16G16_TYPELESS, 16, 16, 0, 0, 0, 16, 0, 0, 4, 0, 0}, {WINED3DFMT_R32_TYPELESS, 32, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0}, @@ -227,6 +226,8 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R10G10B10A2_SNORM, WINED3DFMT_R10G10B10A2_TYPELESS, "iiii"}, {WINED3DFMT_R10G10B10A2_UINT, WINED3DFMT_R10G10B10A2_TYPELESS, "UUUU"}, {WINED3DFMT_R10G10B10A2_UNORM, WINED3DFMT_R10G10B10A2_TYPELESS, "uuuu"}, + {WINED3DFMT_R10G10B10X2_SNORM, WINED3DFMT_R10G10B10X2_TYPELESS, "iiiX"}, + {WINED3DFMT_R10G10B10X2_UINT, WINED3DFMT_R10G10B10X2_TYPELESS, "UUUX"}, {WINED3DFMT_R8G8B8A8_UINT, WINED3DFMT_R8G8B8A8_TYPELESS, "UUUU"}, {WINED3DFMT_R8G8B8A8_SINT, WINED3DFMT_R8G8B8A8_TYPELESS, "IIII"}, {WINED3DFMT_R8G8B8A8_SNORM, WINED3DFMT_R8G8B8A8_TYPELESS, "iiii"}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 239ccd8..ac7e3dd 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -132,6 +132,7 @@ enum wined3d_format_id WINED3DFMT_R5G5_SNORM_L6_UNORM, WINED3DFMT_R8G8_SNORM_L8X8_UNORM, WINED3DFMT_R10G11B11_SNORM, + WINED3DFMT_R10G10B10X2_TYPELESS, WINED3DFMT_R10G10B10X2_UINT, WINED3DFMT_R10G10B10X2_SNORM, WINED3DFMT_R10G10B10_SNORM_A2_UNORM,

1 0

Henri Verbeet : wined3d: Get rid of the "attribute_size" field in struct wined3d_format.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: ccbee769a428cf2de546619790ea563cea3ec3ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccbee769a428cf2de5466197… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 10 01:20:45 2018 +0430 wined3d: Get rid of the "attribute_size" field in struct wined3d_format. Note that "byte_count" is 4 for R10G10B10X2_UINT/R10G10B10X2_SNORM, while "attribute_size" is 6. I think 4 is correct. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/utils.c | 35 ----------------------------------- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 2 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f381b2e..e20d66c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -309,7 +309,7 @@ static BOOL buffer_process_converted_attribute(struct wined3d_buffer *buffer, } data = ((DWORD_PTR)attrib->data.addr) % buffer->stride; - for (i = 0; i < format->attribute_size; ++i) + for (i = 0; i < format->byte_count; ++i) { DWORD_PTR idx = (data + i) % buffer->stride; if (buffer->conversion_map[idx] != conversion_type) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6f13f91..961e3fe 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3665,34 +3665,6 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format->flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; } -static unsigned int calculate_vertex_attribute_size(GLenum type, unsigned int component_count) -{ - switch (type) - { - case GL_HALF_FLOAT: - return component_count * sizeof(GLhalfNV); - case GL_FLOAT: - return component_count * sizeof(GLfloat); - case GL_BYTE: - return component_count * sizeof(GLbyte); - case GL_UNSIGNED_BYTE: - return component_count * sizeof(GLubyte); - case GL_SHORT: - return component_count * sizeof(GLshort); - case GL_UNSIGNED_SHORT: - return component_count * sizeof(GLushort); - case GL_INT: - return component_count * sizeof(GLint); - case GL_UNSIGNED_INT: - return component_count * sizeof(GLuint); - case GL_UNSIGNED_INT_2_10_10_10_REV: - return sizeof(GLuint); - default: - FIXME("Unhandled GL type %#x.\n", type); - return 0; - } -} - static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter, struct wined3d_gl_info *gl_info) { @@ -3712,13 +3684,6 @@ static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter, format->gl_vtx_type = format_vertex_info[i].gl_vtx_type; format->gl_vtx_format = format_vertex_info[i].component_count; format->gl_normalized = format_vertex_info[i].gl_normalized; - if (!(format->attribute_size = calculate_vertex_attribute_size(format->gl_vtx_type, - format->component_count))) - { - ERR("Invalid attribute size for vertex format %s (%#x).\n", - debug_d3dformat(format_vertex_info[i].id), format_vertex_info[i].id); - return FALSE; - } } return TRUE; diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index c050a6d..89329d4 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -315,7 +315,7 @@ static void append_decl_element(struct wined3d_fvf_convert_state *state, elements[idx].usage_idx = usage_idx; format = wined3d_get_format(state->adapter, format_id, 0); - state->offset += format->attribute_size; + state->offset += format->byte_count; ++state->idx; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7084168..9dd3cd2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4346,7 +4346,6 @@ struct wined3d_format GLenum gl_vtx_type; GLint gl_vtx_format; GLboolean gl_normalized; - unsigned int attribute_size; GLint glInternal; GLint glGammaInternal;

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
67
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 September 2018