wine-commits January 2015

wine-commits@winehq.org

2 participants
302 discussions

Francois Gouget : shell32: Reset pszHome if it's not usable so we don' t try to reuse it when setting up the Desktop symlink.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: 169923d4b9f616a56472156e518952aa22c0f5c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=169923d4b9f616a56472156e5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 5 19:27:42 2015 +0100 shell32: Reset pszHome if it's not usable so we don't try to reuse it when setting up the Desktop symlink. --- dlls/shell32/shellpath.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 83df879..0cdc409 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2684,6 +2684,7 @@ static void _SHCreateSymbolicLinks(void) { /* '$HOME' doesn't exist. Create 'My Pictures', 'My Videos' and 'My Music' subdirs * in '%USERPROFILE%\\My Documents' or fail silently if they already exist. */ + pszHome = NULL; strcpy(szPersonalTarget, pszPersonal); for (i = 0; i < sizeof(aidsMyStuff)/sizeof(aidsMyStuff[0]); i++) { strcpy(szMyStuffTarget, szPersonalTarget);

1 0

Francois Gouget : shell32: Fix the IDS_PERSONAL hardcoded default.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: d7fc48463b1ce7b8b587c2f27ff7fe16f0525302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7fc48463b1ce7b8b587c2f27… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 5 19:27:07 2015 +0100 shell32: Fix the IDS_PERSONAL hardcoded default. The corresponding folder is called 'My Documents' but on Linux it's usually called 'Documents' so that's much more appropriate fallback than 'Personal'. --- dlls/shell32/shellpath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index e67babe..83df879 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2573,7 +2573,7 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { /* Fall back to hard coded defaults. */ switch (LOWORD(pwszSubPath)) { case IDS_PERSONAL: - lstrcpyW(wszSubPath, PersonalW); + lstrcpyW(wszSubPath, DocumentsW); break; case IDS_MYMUSIC: lstrcpyW(wszSubPath, My_MusicW);

1 0

Francois Gouget : shell32: Fix a trailing '\n' in a FIXME() call.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: aa096fb456a79d12711c24faf2aab3f379fa168a URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa096fb456a79d12711c24faf… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 5 19:26:24 2015 +0100 shell32: Fix a trailing '\n' in a FIXME() call. --- dlls/shell32/assoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 39e210d..f3c8e65 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -1041,7 +1041,7 @@ HRESULT WINAPI SHAssocEnumHandlers(const WCHAR *extra, ASSOC_FILTER filter, IEnu { struct enumassochandlers *enumassoc; - FIXME("(%s %d %p\n): stub", debugstr_w(extra), filter, enumhandlers); + FIXME("(%s %d %p): stub\n", debugstr_w(extra), filter, enumhandlers); *enumhandlers = NULL;

1 0

Francois Gouget : jscript: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: 861f02b5d14fd44b55036d1af0788159db828b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=861f02b5d14fd44b55036d1af… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 5 19:26:02 2015 +0100 jscript: Add a trailing '\n' to an ok() call. --- dlls/jscript/tests/run.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 1adc25d..c0a62b8 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1954,7 +1954,7 @@ static void test_default_value(void) hres = parse_script_expr("new Date()", &v); ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); - ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d", V_VT(&v)); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); disp = V_DISPATCH(&v); V_VT(&v) = VT_EMPTY;

1 0

Francois Gouget : ws2_32: Add a trailing '\n' to a FIXME() call.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: f2eaf730a51a5a1fc2e39ed1b7d3426a695be7b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2eaf730a51a5a1fc2e39ed1b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 5 19:26:11 2015 +0100 ws2_32: Add a trailing '\n' to a FIXME() call. --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 873d3de..4edc38f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3110,7 +3110,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, addr_size = sizeof(struct sockaddr_in6); else { - FIXME("Family %d is unsupported for SO_BSP_STATE", infow.iAddressFamily); + FIXME("Family %d is unsupported for SO_BSP_STATE\n", infow.iAddressFamily); SetLastError(WSAEAFNOSUPPORT); return SOCKET_ERROR; }

1 0

Henri Verbeet : wined3d: Specify the initial texture contents with wined3d_texture_create() in wined3d_device_create_cursor_texture().
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: 30aa55282e140c6551e7eb4048524f8535baf0e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30aa55282e140c6551e7eb404… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 5 13:24:59 2015 +0100 wined3d: Specify the initial texture contents with wined3d_texture_create() in wined3d_device_create_cursor_texture(). --- dlls/wined3d/device.c | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d26d3f9..1d293bf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3987,13 +3987,11 @@ void CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *device, static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined3d_device *device, struct wined3d_surface *cursor_image) { + struct wined3d_sub_resource_data data; struct wined3d_resource_desc desc; struct wined3d_map_desc map_desc; struct wined3d_texture *texture; - struct wined3d_surface *surface; - BYTE *src_data, *dst_data; - unsigned int src_pitch; - unsigned int i; + HRESULT hr; if (FAILED(wined3d_surface_map(cursor_image, &map_desc, NULL, WINED3D_MAP_READONLY))) { @@ -4001,8 +3999,9 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined return NULL; } - src_pitch = map_desc.row_pitch; - src_data = map_desc.data; + data.data = map_desc.data; + data.row_pitch = map_desc.row_pitch; + data.slice_pitch = map_desc.slice_pitch; desc.resource_type = WINED3D_RTYPE_TEXTURE; desc.format = WINED3DFMT_B8G8R8A8_UNORM; @@ -4015,31 +4014,15 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined desc.depth = 1; desc.size = 0; - if (FAILED(wined3d_texture_create(device, &desc, 1, WINED3D_SURFACE_MAPPABLE, - NULL, NULL, &wined3d_null_parent_ops, &texture))) + hr = wined3d_texture_create(device, &desc, 1, WINED3D_SURFACE_MAPPABLE, + &data, NULL, &wined3d_null_parent_ops, &texture); + wined3d_surface_unmap(cursor_image); + if (FAILED(hr)) { ERR("Failed to create cursor texture.\n"); - wined3d_surface_unmap(cursor_image); return NULL; } - surface = surface_from_resource(wined3d_texture_get_sub_resource(texture, 0)); - if (FAILED(wined3d_surface_map(surface, &map_desc, NULL, WINED3D_MAP_DISCARD))) - { - ERR("Failed to map destination surface.\n"); - wined3d_texture_decref(texture); - wined3d_surface_unmap(cursor_image); - return NULL; - } - - dst_data = map_desc.data; - - for (i = 0; i < desc.height; ++i) - memcpy(&dst_data[map_desc.row_pitch * i], &src_data[src_pitch * i], desc.width * 4); - - wined3d_surface_unmap(surface); - wined3d_surface_unmap(cursor_image); - return texture; }

1 0

Henri Verbeet : wined3d: Allow initial texture contents to be specified with wined3d_texture_create ().
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: ea534c9ab4d21ee3553a6b265c59ac548d651c89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea534c9ab4d21ee3553a6b265… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 5 13:24:58 2015 +0100 wined3d: Allow initial texture contents to be specified with wined3d_texture_create(). --- dlls/d3d10core/d3d10core_private.h | 4 +- dlls/d3d10core/device.c | 8 ++-- dlls/d3d10core/texture.c | 14 +++--- dlls/d3d8/device.c | 4 +- dlls/d3d8/texture.c | 6 +-- dlls/d3d9/device.c | 4 +- dlls/d3d9/texture.c | 6 +-- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/surface.c | 4 +- dlls/wined3d/device.c | 6 +-- dlls/wined3d/surface.c | 12 ++--- dlls/wined3d/texture.c | 91 ++++++++++++++++++++++++++++++++++++-- dlls/wined3d/volume.c | 24 +++++----- dlls/wined3d/wined3d_private.h | 21 ++++++++- include/wine/wined3d.h | 11 ++++- 15 files changed, 164 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea534c9ab4d21ee3553a6…

1 0

Henri Verbeet : wined3d: Reject wined3d_texture_create() calls without explicit level count.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: 08aded431b2eaba2509b24f49f8e3abf2db2480e URL: http://source.winehq.org/git/wine.git/?a=commit;h=08aded431b2eaba2509b24f49… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 5 13:24:57 2015 +0100 wined3d: Reject wined3d_texture_create() calls without explicit level count. --- dlls/wined3d/texture.c | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6ecd414..dfcf02d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1022,18 +1022,11 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, const struct wi return WINED3DERR_INVALIDCALL; } - if (levels > 1) + if (levels != 1) { - WARN("D3DUSAGE_AUTOGENMIPMAP is set, and level count > 1, returning D3DERR_INVALIDCALL.\n"); + WARN("WINED3DUSAGE_AUTOGENMIPMAP is set, and level count != 1, returning D3DERR_INVALIDCALL.\n"); return WINED3DERR_INVALIDCALL; } - - levels = 1; - } - else if (!levels) - { - levels = wined3d_log2i(desc->width) + 1; - TRACE("Calculated levels = %u.\n", levels); } if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) @@ -1168,18 +1161,11 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 return WINED3DERR_INVALIDCALL; } - if (levels > 1) + if (levels != 1) { - WARN("D3DUSAGE_AUTOGENMIPMAP is set, and level count > 1, returning WINED3DERR_INVALIDCALL.\n"); + WARN("WINED3DUSAGE_AUTOGENMIPMAP is set, and level count != 1, returning WINED3DERR_INVALIDCALL.\n"); return WINED3DERR_INVALIDCALL; } - - levels = 1; - } - else if (!levels) - { - levels = wined3d_log2i(max(desc->width, desc->height)) + 1; - TRACE("Calculated levels = %u.\n", levels); } if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels, desc, @@ -1366,18 +1352,11 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct return WINED3DERR_INVALIDCALL; } - if (levels > 1) + if (levels != 1) { - WARN("D3DUSAGE_AUTOGENMIPMAP is set, and level count > 1, returning D3DERR_INVALIDCALL.\n"); + WARN("WINED3DUSAGE_AUTOGENMIPMAP is set, and level count != 1, returning D3DERR_INVALIDCALL.\n"); return WINED3DERR_INVALIDCALL; } - - levels = 1; - } - else if (!levels) - { - levels = wined3d_log2i(max(max(desc->width, desc->height), desc->depth)) + 1; - TRACE("Calculated levels = %u.\n", levels); } if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) @@ -1456,6 +1435,12 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct TRACE("device %p, desc %p, level_count %u, surface_flags %#x, parent %p, parent_ops %p, texture %p.\n", device, desc, level_count, surface_flags, parent, parent_ops, texture); + if (!level_count) + { + WARN("Invalid level count.\n"); + return WINED3DERR_INVALIDCALL; + } + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY;

1 0

Hans Leidekker : wbemprox: Implement Win32_LogicalDisk::VolumeName.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: be6575ef4c25bb0c5e6c88d1e10a01b08bb5cef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be6575ef4c25bb0c5e6c88d1e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 5 13:19:28 2015 +0100 wbemprox: Implement Win32_LogicalDisk::VolumeName. --- dlls/wbemprox/builtin.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 6337fef..3158c0e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -281,6 +281,8 @@ static const WCHAR prop_varianttypeW[] = {'V','a','r','i','a','n','t','T','y','p','e',0}; static const WCHAR prop_versionW[] = {'V','e','r','s','i','o','n',0}; +static const WCHAR prop_volumenameW[] = + {'V','o','l','u','m','e','N','a','m','e',0}; static const WCHAR prop_volumeserialnumberW[] = {'V','o','l','u','m','e','S','e','r','i','a','l','N','u','m','b','e','r',0}; @@ -364,6 +366,7 @@ static const struct column col_logicaldisk[] = { prop_freespaceW, CIM_UINT64 }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_sizeW, CIM_UINT64 }, + { prop_volumenameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_volumeserialnumberW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_networkadapter[] = @@ -677,6 +680,7 @@ struct record_logicaldisk UINT64 freespace; const WCHAR *name; UINT64 size; + const WCHAR *volumename; const WCHAR *volumeserialnumber; }; struct record_networkadapter @@ -1650,6 +1654,12 @@ static enum fill_status fill_diskpartition( struct table *table, const struct ex return status; } +static WCHAR *get_volumename( const WCHAR *root ) +{ + WCHAR buf[MAX_PATH + 1] = {0}; + GetVolumeInformationW( root, buf, sizeof(buf)/sizeof(buf[0]), NULL, NULL, NULL, NULL, 0 ); + return heap_strdupW( buf ); +} static WCHAR *get_volumeserialnumber( const WCHAR *root ) { static const WCHAR fmtW[] = {'%','0','8','X',0}; @@ -1692,6 +1702,7 @@ static enum fill_status fill_logicaldisk( struct table *table, const struct expr rec->freespace = get_freespace( root, &size ); rec->name = heap_strdupW( device_id ); rec->size = size; + rec->volumename = get_volumename( root ); rec->volumeserialnumber = get_volumeserialnumber( root ); if (!match_row( table, row, cond, &status )) {

1 0

Hans Leidekker : advapi32: Return an error from RegSetValueExW if passed a NULL data pointer and non-zero size.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: ff0ee8f8a8faf35d148f00e4de2671feee051be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0ee8f8a8faf35d148f00e4d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 5 13:18:50 2015 +0100 advapi32: Return an error from RegSetValueExW if passed a NULL data pointer and non-zero size. --- dlls/advapi32/registry.c | 2 +- dlls/advapi32/tests/registry.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 8e33ab3..620dd6a 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1201,7 +1201,7 @@ LSTATUS WINAPI RegSetValueExW( HKEY hkey, LPCWSTR name, DWORD reserved, /* no need for version check, not implemented on win9x anyway */ - if (data && ((ULONG_PTR)data >> 16) == 0) return ERROR_NOACCESS; + if ((data && ((ULONG_PTR)data >> 16) == 0) || (!data && count)) return ERROR_NOACCESS; if (count && is_string(type)) { diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index bcf3d7d..3acda0e 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -436,6 +436,21 @@ static void test_set_value(void) ret = RegSetValueExW(hkey_main, name2W, 0, REG_DWORD, (const BYTE *)1, 1); ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); + if (pRegGetValueA) /* avoid a crash on Windows 2000 */ + { + ret = RegSetValueExW(hkey_main, NULL, 0, REG_SZ, NULL, 4); + ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); + + ret = RegSetValueExW(hkey_main, NULL, 0, REG_SZ, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + ret = RegSetValueExW(hkey_main, NULL, 0, REG_DWORD, NULL, 4); + ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); + + ret = RegSetValueExW(hkey_main, NULL, 0, REG_DWORD, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + } + /* RegSetKeyValue */ if (!pRegSetKeyValueW) win_skip("RegSetKeyValue() is not supported.\n"); @@ -464,6 +479,12 @@ static void test_set_value(void) ret = pRegSetKeyValueW(hkey_main, subkeyW, name1W, REG_SZ, NULL, 0); ok(ret == ERROR_SUCCESS, "got %d\n", ret); + ret = pRegSetKeyValueW(hkey_main, subkeyW, name1W, REG_SZ, NULL, 4); + ok(ret == ERROR_NOACCESS, "got %d\n", ret); + + ret = pRegSetKeyValueW(hkey_main, subkeyW, name1W, REG_DWORD, NULL, 4); + ok(ret == ERROR_NOACCESS, "got %d\n", ret); + RegCloseKey(subkey); } }

1 0

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 January 2015