wine-commits April 2015

wine-commits@winehq.org

2 participants
451 discussions

Matteo Bruni : wined3d: Rename struct wined3d_shader_buffer to wined3d_string_buffer.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 64463b81dfb2a2c8fcfd3388d588983c77513294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64463b81dfb2a2c8fcfd3388d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 24 22:25:41 2015 +0200 wined3d: Rename struct wined3d_shader_buffer to wined3d_string_buffer. Also rename the shader_buffer_(clear|init|free) functions. --- dlls/wined3d/arb_program_shader.c | 168 +++++++++++++++++++------------------- dlls/wined3d/glsl_shader.c | 102 +++++++++++------------ dlls/wined3d/shader.c | 14 ++-- dlls/wined3d/wined3d_private.h | 17 ++-- 4 files changed, 150 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64463b81dfb2a2c8fcfd3…

1 0

Hans Leidekker : advapi32: Return fake handles from RegisterTraceGuidsW.
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: 191b1bfbba1863c8970bee0fa026c14f91d8e93c URL: http://source.winehq.org/git/wine.git/?a=commit;h=191b1bfbba1863c8970bee0fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 24 14:48:49 2015 +0200 advapi32: Return fake handles from RegisterTraceGuidsW. --- dlls/advapi32/eventlog.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index bebb08b..191d817 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -772,6 +772,17 @@ ULONG WINAPI RegisterTraceGuidsW( WMIDPREQUEST RequestAddress, FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_w(MofImagePath), debugstr_w(MofResourceName), RegistrationHandle); + + if (TraceGuidReg) + { + ULONG i; + for (i = 0; i < GuidCount; i++) + { + FIXME(" register trace class %s\n", debugstr_guid(TraceGuidReg[i].Guid)); + TraceGuidReg[i].RegHandle = (HANDLE)0xdeadbeef; + } + } + *RegistrationHandle = (TRACEHANDLE)0xdeadbeef; return ERROR_SUCCESS; }

1 0

Hans Leidekker : msvcr120: Add _ismbcprint export.
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: da7f6c8b644caf45006520cd0e59cff17126a132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7f6c8b644caf45006520cd0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 24 14:48:26 2015 +0200 msvcr120: Add _ismbcprint export. --- dlls/msvcr120/msvcr120.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c14ac45..811dcee 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1345,7 +1345,7 @@ @ stub _ismbclegal_l @ stub _ismbclower(long) @ stub _ismbclower_l -@ stub _ismbcprint(long) +@ cdecl _ismbcprint(long) @ stub _ismbcprint_l @ cdecl _ismbcpunct(long) @ stub _ismbcpunct_l

1 0

Hans Leidekker : msvcrt: Handle NULL arguments in _mbscmp.
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: bbd0e56a5832b8b6135d9300005747d07ec33cd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd0e56a5832b8b6135d93000… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 24 14:48:04 2015 +0200 msvcrt: Handle NULL arguments in _mbscmp. --- dlls/msvcrt/mbcs.c | 3 +++ dlls/msvcrt/tests/string.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 044c2bd..4c85b90 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -24,6 +24,7 @@ */ #include <stdio.h> +#include <limits.h> #include "msvcrt.h" #include "wine/unicode.h" @@ -769,6 +770,8 @@ unsigned char* CDECL _mbsnbcpy(unsigned char* dst, const unsigned char* src, MSV */ int CDECL _mbscmp(const unsigned char* str, const unsigned char* cmp) { + if (!str || !cmp) return INT_MAX; + if(get_mbcinfo()->ismbcodepage) { unsigned int strc, cmpc; diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index cf609f7..3893ba7 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2874,6 +2874,36 @@ static void test__wcsset_s(void) ok(str[2] == 'b', "str[2] = %d\n", str[2]); } +static void test__mbscmp(void) +{ + static const unsigned char a[] = {'a',0}, b[] = {'b',0}; + int ret; + + if (!p_mbrlen) + { + win_skip("_mbscmp tests\n"); + return; + } + + ret = _mbscmp(NULL, NULL); + ok(ret == INT_MAX, "got %d\n", ret); + + ret = _mbscmp(a, NULL); + ok(ret == INT_MAX, "got %d\n", ret); + + ret = _mbscmp(NULL, a); + ok(ret == INT_MAX, "got %d\n", ret); + + ret = _mbscmp(a, a); + ok(!ret, "got %d\n", ret); + + ret = _mbscmp(a, b); + ok(ret == -1, "got %d\n", ret); + + ret = _mbscmp(b, a); + ok(ret == 1, "got %d\n", ret); +} + START_TEST(string) { char mem[100]; @@ -2981,4 +3011,5 @@ START_TEST(string) test_strxfrm(); test__strnset_s(); test__wcsset_s(); + test__mbscmp(); }

1 0

Jacek Caban : wininet: Initialize send and receive timeouts to 0.
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: 07520fbf12dff4b400892aabd30ef65c4bb59997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07520fbf12dff4b400892aabd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 24 14:39:29 2015 +0200 wininet: Initialize send and receive timeouts to 0. --- dlls/wininet/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 04cd281..8a872e8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5827,8 +5827,8 @@ DWORD HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, session->password = heap_strdupW(lpszPassword); session->hostPort = serverPort; session->connect_timeout = hIC->connect_timeout; - session->send_timeout = INFINITE; - session->receive_timeout = INFINITE; + session->send_timeout = 0; + session->receive_timeout = 0; /* Don't send a handle created callback if this handle was created with InternetOpenUrl */ if (!(session->hdr.dwInternalFlags & INET_OPENURL))

1 0

Nikolay Sivov : msdmo: Add more tracing.
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: 70297c424ad717b270e7aaf5c48b32b0e22ccd95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70297c424ad717b270e7aaf5c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 11:13:10 2015 +0300 msdmo: Add more tracing. --- dlls/msdmo/dmoreg.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 7ae01a1..dea079a 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -506,7 +506,6 @@ static HRESULT WINAPI IEnumDMO_fnNext( WCHAR ** Names, DWORD * pcItemsFetched) { - FILETIME ft; HKEY hkey; WCHAR szNextKey[MAX_PATH]; WCHAR szGuidKey[64]; @@ -529,7 +528,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( This->index++; len = MAX_PATH; - ret = RegEnumKeyExW(This->hkey, This->index, szNextKey, &len, NULL, NULL, NULL, &ft); + ret = RegEnumKeyExW(This->hkey, This->index, szNextKey, &len, NULL, NULL, NULL, NULL); if (ret != ERROR_SUCCESS) { hres = HRESULT_FROM_WIN32(ret); @@ -552,6 +551,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( wsprintfW(szKey, szCat2Fmt, szDMORootKey, szNextKey); ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &hkey); + TRACE("testing %s\n", debugstr_w(szKey)); if (This->pInTypes) { @@ -571,6 +571,12 @@ static HRESULT WINAPI IEnumDMO_fnNext( pInTypes = (DMO_PARTIAL_MEDIATYPE*) szValue; + TRACE("read %d intypes for %s:\n", cInTypes, debugstr_w(szKey)); + for (i = 0; i < cInTypes; i++) { + TRACE("intype %d: type %s, subtype %s\n", i, debugstr_guid(&pInTypes[i].type), + debugstr_guid(&pInTypes[i].subtype)); + } + for (i = 0; i < This->cInTypes; i++) { for (j = 0; j < cInTypes; j++) @@ -608,6 +614,12 @@ static HRESULT WINAPI IEnumDMO_fnNext( pOutTypes = (DMO_PARTIAL_MEDIATYPE*) szValue; + TRACE("read %d outtypes for %s:\n", cOutTypes, debugstr_w(szKey)); + for (i = 0; i < cOutTypes; i++) { + TRACE("outtype %d: type %s, subtype %s\n", i, debugstr_guid(&pOutTypes[i].type), + debugstr_guid(&pOutTypes[i].subtype)); + } + for (i = 0; i < This->cOutTypes; i++) { for (j = 0; j < cOutTypes; j++)

1 0

Nikolay Sivov : msdmo: Added a helper to duplicate partial media type arrays.
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: 55620f097cdbee98f4c4113c3441a50539eb63bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=55620f097cdbee98f4c4113c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 10:08:18 2015 +0300 msdmo: Added a helper to duplicate partial media type arrays. --- dlls/msdmo/dmoreg.c | 53 +++++++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 7a81398..7ae01a1 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -360,6 +360,21 @@ HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR name[]) return S_FALSE; } +static HRESULT dup_partial_mediatype(const DMO_PARTIAL_MEDIATYPE *types, DWORD count, DMO_PARTIAL_MEDIATYPE **ret) +{ + *ret = NULL; + + if (count == 0) + return S_OK; + + *ret = HeapAlloc(GetProcessHeap(), 0, count*sizeof(*types)); + if (!*ret) + return E_OUTOFMEMORY; + + memcpy(*ret, types, count*sizeof(*types)); + return S_OK; +} + /************************************************************************** * IEnumDMO_Constructor */ @@ -373,8 +388,7 @@ static HRESULT IEnumDMO_Constructor( IEnumDMO **obj) { IEnumDMOImpl* lpedmo; - HRESULT hr = S_OK; - UINT size; + HRESULT hr; LONG ret; *obj = NULL; @@ -388,32 +402,16 @@ static HRESULT IEnumDMO_Constructor( lpedmo->index = -1; lpedmo->category = *guidCategory; lpedmo->dwFlags = dwFlags; + lpedmo->cInTypes = cInTypes; + lpedmo->cOutTypes = cOutTypes; - if (cInTypes > 0) - { - size = cInTypes * sizeof(DMO_PARTIAL_MEDIATYPE); - lpedmo->pInTypes = HeapAlloc(GetProcessHeap(), 0, size); - if (!lpedmo->pInTypes) - { - hr = E_OUTOFMEMORY; - goto lerr; - } - memcpy(lpedmo->pInTypes, pInTypes, size); - lpedmo->cInTypes = cInTypes; - } + hr = dup_partial_mediatype(pInTypes, cInTypes, &lpedmo->pInTypes); + if (FAILED(hr)) + goto lerr; - if (cOutTypes > 0) - { - size = cOutTypes * sizeof(DMO_PARTIAL_MEDIATYPE); - lpedmo->pOutTypes = HeapAlloc(GetProcessHeap(), 0, size); - if (!lpedmo->pOutTypes) - { - hr = E_OUTOFMEMORY; - goto lerr; - } - memcpy(lpedmo->pOutTypes, pOutTypes, size); - lpedmo->cOutTypes = cOutTypes; - } + hr = dup_partial_mediatype(pOutTypes, cOutTypes, &lpedmo->pOutTypes); + if (FAILED(hr)) + goto lerr; /* If not filtering by category enum from media objects root */ if (IsEqualGUID(guidCategory, &GUID_NULL)) @@ -426,8 +424,7 @@ static HRESULT IEnumDMO_Constructor( WCHAR szguid[64]; WCHAR szKey[MAX_PATH]; - wsprintfW(szKey, szCat3Fmt, szDMORootKey, szDMOCategories, - GUIDToString(szguid, guidCategory)); + wsprintfW(szKey, szCat3Fmt, szDMORootKey, szDMOCategories, GUIDToString(szguid, guidCategory)); if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &lpedmo->hkey))) hr = HRESULT_FROM_WIN32(ret); }

1 0

Nikolay Sivov : msdmo: Store requested category GUID instead of a pointer to it.
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: 0b7b8e3dc34a2bc1156e1a2c7c0d42cc989cc22e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b7b8e3dc34a2bc1156e1a2c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 09:58:50 2015 +0300 msdmo: Store requested category GUID instead of a pointer to it. --- dlls/msdmo/dmoreg.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index f9bf9b3..7a81398 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -90,7 +90,7 @@ typedef struct IEnumDMO IEnumDMO_iface; LONG ref; DWORD index; - const GUID* guidCategory; + GUID category; DWORD dwFlags; DWORD cInTypes; DMO_PARTIAL_MEDIATYPE *pInTypes; @@ -386,7 +386,7 @@ static HRESULT IEnumDMO_Constructor( lpedmo->IEnumDMO_iface.lpVtbl = &edmovt; lpedmo->ref = 1; lpedmo->index = -1; - lpedmo->guidCategory = guidCategory; + lpedmo->category = *guidCategory; lpedmo->dwFlags = dwFlags; if (cInTypes > 0) @@ -692,7 +692,7 @@ static HRESULT WINAPI IEnumDMO_fnClone(IEnumDMO *iface, IEnumDMO **ppEnum) { IEnumDMOImpl *This = impl_from_IEnumDMO(iface); TRACE("(%p)->(%p)\n", This, ppEnum); - return IEnumDMO_Constructor(This->guidCategory, This->dwFlags, This->cInTypes, This->pInTypes, + return IEnumDMO_Constructor(&This->category, This->dwFlags, This->cInTypes, This->pInTypes, This->cOutTypes, This->pOutTypes, ppEnum); } @@ -703,18 +703,35 @@ static HRESULT WINAPI IEnumDMO_fnClone(IEnumDMO *iface, IEnumDMO **ppEnum) * Enumerate DirectX Media Objects in the registry. */ HRESULT WINAPI DMOEnum( - REFGUID guidCategory, - DWORD dwFlags, + REFGUID category, + DWORD flags, DWORD cInTypes, const DMO_PARTIAL_MEDIATYPE *pInTypes, DWORD cOutTypes, const DMO_PARTIAL_MEDIATYPE *pOutTypes, IEnumDMO **ppEnum) { - TRACE("guidCategory=%p dwFlags=0x%08x cInTypes=%d cOutTypes=%d\n", - guidCategory, dwFlags, cInTypes, cOutTypes); + TRACE("%s 0x%08x %d %p %d %p %p\n", debugstr_guid(category), flags, cInTypes, pInTypes, + cOutTypes, pOutTypes, ppEnum); + + if (TRACE_ON(msdmo)) + { + DWORD i; + if (cInTypes) + { + for (i = 0; i < cInTypes; i++) + TRACE("intype %d - type %s, subtype %s\n", i, debugstr_guid(&pInTypes[i].type), + debugstr_guid(&pInTypes[i].subtype)); + } + + if (cOutTypes) { + for (i = 0; i < cOutTypes; i++) + TRACE("outtype %d - type %s, subtype %s\n", i, debugstr_guid(&pOutTypes[i].type), + debugstr_guid(&pOutTypes[i].subtype)); + } + } - return IEnumDMO_Constructor(guidCategory, dwFlags, cInTypes, + return IEnumDMO_Constructor(category, flags, cInTypes, pInTypes, cOutTypes, pOutTypes, ppEnum); }

1 0

Stefan Dösinger : wined3d: Move the EXT_texture3D check to init_format_texture_info.
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: 072e1a3fb26336ee9f363529695dcbae84da64d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=072e1a3fb26336ee9f3635296… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 24 10:33:50 2015 +0200 wined3d: Move the EXT_texture3D check to init_format_texture_info. --- dlls/wined3d/directx.c | 9 --------- dlls/wined3d/utils.c | 9 ++++++++- dlls/wined3d/volume.c | 5 ----- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7e0d530..84c3aa2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4490,15 +4490,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad case WINED3D_RTYPE_VOLUME_TEXTURE: case WINED3D_RTYPE_VOLUME: - /* Volume is to VolumeTexture what Surface is to Texture, but its - * usage caps are not documented. Most driver seem to offer - * (nearly) the same on Volume and VolumeTexture, so do that too. */ - if (!gl_info->supported[EXT_TEXTURE3D]) - { - TRACE("[FAILED] - No volume texture support.\n"); - return WINED3DERR_NOTAVAILABLE; - } - /* The GL_EXT_texture_compression_s3tc spec requires that loading * an s3tc compressed texture results in an error. While the D3D * refrast does support s3tc volumes, at least the nvidia Windows diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index fadd0c9..1d34440 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1852,10 +1852,17 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win format->glFormat = format_texture_info[i].gl_format; format->glType = format_texture_info[i].gl_type; format->color_fixup = COLOR_FIXUP_IDENTITY; - format_set_flag(format, format_texture_info[i].flags); format->height_scale.numerator = 1; format->height_scale.denominator = 1; + format->flags[WINED3D_GL_RES_TYPE_TEX_1D] |= format_texture_info[i].flags; + format->flags[WINED3D_GL_RES_TYPE_TEX_2D] |= format_texture_info[i].flags; + if (gl_info->supported[EXT_TEXTURE3D]) + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] |= format_texture_info[i].flags; + format->flags[WINED3D_GL_RES_TYPE_TEX_CUBE] |= format_texture_info[i].flags; + format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] |= format_texture_info[i].flags; + format->flags[WINED3D_GL_RES_TYPE_BUFFER] |= format_texture_info[i].flags; + if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2]) { query_format_flag(gl_info, format, format->glInternal, GL_VERTEX_TEXTURE, diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index a231081..5241286 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -748,11 +748,6 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_texture HRESULT hr; UINT size; - if (!gl_info->supported[EXT_TEXTURE3D]) - { - WARN("Volume cannot be created - no volume texture support.\n"); - return WINED3DERR_INVALIDCALL; - } /* TODO: Write tests for other resources and move this check * to resource_init, if applicable. */ if (desc->usage & WINED3DUSAGE_DYNAMIC

1 0

Stefan Dösinger : wined3d: Query info for each resource type from ARB_internalformat_query2.
by Alexandre Julliard 24 Apr '15

24 Apr '15

Module: wine Branch: master Commit: 9def5ff4098db8be848ef101c8dd7a85d7781fdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9def5ff4098db8be848ef101c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 24 10:33:49 2015 +0200 wined3d: Query info for each resource type from ARB_internalformat_query2. --- dlls/wined3d/utils.c | 159 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 109 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9def5ff4098db8be848ef…

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
46
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 April 2015