January 2015 - Wine-Commits

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 Jan. 5, 2015

Jan. 5, 2015

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

Hans Leidekker : wbemprox: Implement Win32_LogicalDisk::VolumeName.
by Alexandre Julliard Jan. 5, 2015

Jan. 5, 2015

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

Henri Verbeet : wined3d: Allow initial texture contents to be specified with wined3d_texture_create ().
by Alexandre Julliard Jan. 5, 2015

Jan. 5, 2015

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 Jan. 5, 2015

Jan. 5, 2015

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

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

Jan. 5, 2015

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

Bruno Jesus : include: Add support for WS_ prefixed IPX names in wsnwlink.h.
by Alexandre Julliard Jan. 5, 2015

Jan. 5, 2015

Module: wine Branch: master Commit: 1c21aeeebc698abf366a7611fef8e9eeee27b2d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c21aeeebc698abf366a7611f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jan 4 16:57:47 2015 -0200 include: Add support for WS_ prefixed IPX names in wsnwlink.h. --- dlls/ws2_32/socket.c | 10 +++++----- include/wsnwlink.h | 25 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f81f842..873d3de 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3377,7 +3377,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, int namelen; switch(optname) { - case IPX_PTYPE: + case WS_IPX_PTYPE: if ((fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; #ifdef SOL_IPX if(getsockopt(fd, SOL_IPX, IPX_TYPE, optval, (socklen_t *)optlen) == -1) @@ -3398,7 +3398,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, release_sock_fd( s, fd ); return ret; - case IPX_ADDRESS: + case WS_IPX_ADDRESS: /* * On a Win2000 system with one network card there are usually * three ipx devices one with a speed of 28.8kbps, 10Mbps and 100Mbps. @@ -3423,7 +3423,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, * note 1MB = 1000kB in this case */ return 0; - case IPX_MAX_ADAPTER_NUM: + case WS_IPX_MAX_ADAPTER_NUM: FIXME("IPX_MAX_ADAPTER_NUM\n"); *(int*)optval = 1; /* As noted under IPX_ADDRESS we have just one card. */ return 0; @@ -4984,10 +4984,10 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_NSPROTO_IPX: switch(optname) { - case IPX_PTYPE: + case WS_IPX_PTYPE: return set_ipx_packettype(s, *(int*)optval); - case IPX_FILTERPTYPE: + case WS_IPX_FILTERPTYPE: /* Sets the receive filter packet type, at the moment we don't support it */ FIXME("IPX_FILTERPTYPE: %x\n", *optval); /* Returning 0 is better for now than returning a SOCKET_ERROR */ diff --git a/include/wsnwlink.h b/include/wsnwlink.h index 5a5bb8b..f237f0d 100644 --- a/include/wsnwlink.h +++ b/include/wsnwlink.h @@ -19,6 +19,13 @@ #ifndef _WSNWLINK_ #define _WSNWLINK_ +#ifdef USE_WS_PREFIX +#define WS(x) WS_##x +#else +#define WS(x) x +#endif + +#ifndef USE_WS_PREFIX #define IPX_PTYPE 0x4000 #define IPX_FILTERPTYPE 0x4001 #define IPX_DSTYPE 0x4002 @@ -35,6 +42,24 @@ #define IPX_RERIPNETNUMBER 0x400e #define IPX_RECEIVE_BROADCAST 0x400f #define IPX_IMMEDIATESPXACK 0x4010 +#else +#define WS_IPX_PTYPE 0x4000 +#define WS_IPX_FILTERPTYPE 0x4001 +#define WS_IPX_DSTYPE 0x4002 +#define WS_IPX_STOPFILTERPTYPE 0x4003 +#define WS_IPX_EXTENDED_ADDRESS 0x4004 +#define WS_IPX_RECVHDR 0x4005 +#define WS_IPX_MAXSIZE 0x4006 +#define WS_IPX_ADDRESS 0x4007 +#define WS_IPX_GETNETINFO 0x4008 +#define WS_IPX_GETNETINFO_NORIP 0x4009 +#define WS_IPX_SPXGETCONNECTIONSTATUS 0x400b +#define WS_IPX_ADDRESS_NOTIFY 0x400c +#define WS_IPX_MAX_ADAPTER_NUM 0x400d +#define WS_IPX_RERIPNETNUMBER 0x400e +#define WS_IPX_RECEIVE_BROADCAST 0x400f +#define WS_IPX_IMMEDIATESPXACK 0x4010 +#endif /* USE_WS_PREFIX */ typedef struct _IPX_ADDRESS_DATA { INT adapternum;

1 0

Stefan Leichter : ntoskrnl.exe: Add stub for KeSetSystemAffinityThread.
by Alexandre Julliard Jan. 5, 2015

Jan. 5, 2015

Module: wine Branch: master Commit: f592eea591d4232ae42bce0db0953a1fa487e88d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f592eea591d4232ae42bce0db… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Jan 2 12:44:38 2015 +0100 ntoskrnl.exe: Add stub for KeSetSystemAffinityThread. --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2285ec6..c10377a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1452,6 +1452,13 @@ KPRIORITY WINAPI KeSetPriorityThread( PKTHREAD Thread, KPRIORITY Priority ) return Priority; } +/*********************************************************************** + * KeSetSystemAffinityThread (NTOSKRNL.EXE.@) + */ +VOID WINAPI KeSetSystemAffinityThread(KAFFINITY Affinity) +{ + FIXME("(%lx) stub\n", Affinity); +} /*********************************************************************** * KeWaitForSingleObject (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 228da29..b824250 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -614,7 +614,7 @@ @ stub KeSetKernelStackSwapEnable @ stdcall KeSetPriorityThread(ptr long) @ stub KeSetProfileIrql -@ stub KeSetSystemAffinityThread +@ stdcall KeSetSystemAffinityThread(long) @ stub KeSetTargetProcessorDpc @ stub KeSetTimeIncrement @ stub KeSetTimer diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 29b24e7..e4f693a 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1226,6 +1226,7 @@ LONG WINAPI KeReleaseSemaphore(PRKSEMAPHORE,KPRIORITY,LONG,BOOLEAN); LONG WINAPI KeResetEvent(PRKEVENT); LONG WINAPI KeSetEvent(PRKEVENT,KPRIORITY,BOOLEAN); KPRIORITY WINAPI KeSetPriorityThread(PKTHREAD,KPRIORITY); +void WINAPI KeSetSystemAffinityThread(KAFFINITY); PVOID WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS); PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T);

1 0

Nikolay Sivov : dwrite: Store locale name for each text range.
by Alexandre Julliard Jan. 5, 2015

Jan. 5, 2015

Module: wine Branch: master Commit: aecec3847a75cbb53df7b8f7a2225967e686a45b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aecec3847a75cbb53df7b8f7a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 1 21:50:59 2015 +0300 dwrite: Store locale name for each text range. --- dlls/dwrite/layout.c | 74 ++++++++++++++++++++++++++++++++++++++-------- dlls/dwrite/tests/layout.c | 67 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index ba35713..0ddb0b4 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -67,7 +67,8 @@ enum layout_range_attr_kind { LAYOUT_RANGE_ATTR_INLINE, LAYOUT_RANGE_ATTR_UNDERLINE, LAYOUT_RANGE_ATTR_STRIKETHROUGH, - LAYOUT_RANGE_ATTR_FONTCOLL + LAYOUT_RANGE_ATTR_FONTCOLL, + LAYOUT_RANGE_ATTR_LOCALE }; struct layout_range_attr_value { @@ -82,6 +83,7 @@ struct layout_range_attr_value { BOOL underline; BOOL strikethrough; IDWriteFontCollection *collection; + const WCHAR *locale; } u; }; @@ -97,6 +99,7 @@ struct layout_range { BOOL underline; BOOL strikethrough; IDWriteFontCollection *collection; + WCHAR locale[LOCALE_NAME_MAX_LENGTH]; }; struct layout_run { @@ -402,6 +405,8 @@ static BOOL is_same_layout_attrvalue(struct layout_range const *range, enum layo return range->strikethrough == value->u.strikethrough; case LAYOUT_RANGE_ATTR_FONTCOLL: return range->collection == value->u.collection; + case LAYOUT_RANGE_ATTR_LOCALE: + return strcmpW(range->locale, value->u.locale) == 0; default: ; } @@ -447,6 +452,7 @@ static struct layout_range *alloc_layout_range(struct dwrite_textlayout *layout, range->collection = layout->format.collection; if (range->collection) IDWriteFontCollection_AddRef(range->collection); + strcpyW(range->locale, layout->format.locale); return range; } @@ -579,6 +585,11 @@ static BOOL set_layout_range_attrval(struct layout_range *dest, enum layout_rang if (dest->collection) IDWriteFontCollection_AddRef(dest->collection); break; + case LAYOUT_RANGE_ATTR_LOCALE: + changed = strcmpW(dest->locale, value->u.locale) != 0; + if (changed) + strcpyW(dest->locale, value->u.locale); + break; default: ; } @@ -1127,17 +1138,17 @@ static HRESULT WINAPI dwritetextlayout_SetDrawingEffect(IDWriteTextLayout2 *ifac return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_EFFECT, &value); } -static HRESULT WINAPI dwritetextlayout_SetInlineObject(IDWriteTextLayout2 *iface, IDWriteInlineObject *object, DWRITE_TEXT_RANGE r) +static HRESULT WINAPI dwritetextlayout_SetInlineObject(IDWriteTextLayout2 *iface, IDWriteInlineObject *object, DWRITE_TEXT_RANGE range) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); struct layout_range_attr_value attr; - TRACE("(%p)->(%p %s)\n", This, object, debugstr_range(&r)); + TRACE("(%p)->(%p %s)\n", This, object, debugstr_range(&range)); - if (!validate_text_range(This, &r)) + if (!validate_text_range(This, &range)) return S_OK; - attr.range = r; + attr.range = range; attr.u.object = object; return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_INLINE, &attr); @@ -1153,8 +1164,20 @@ static HRESULT WINAPI dwritetextlayout_SetTypography(IDWriteTextLayout2 *iface, static HRESULT WINAPI dwritetextlayout_SetLocaleName(IDWriteTextLayout2 *iface, WCHAR const* locale, DWRITE_TEXT_RANGE range) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%s %s): stub\n", This, debugstr_w(locale), debugstr_range(&range)); - return E_NOTIMPL; + struct layout_range_attr_value attr; + + TRACE("(%p)->(%s %s)\n", This, debugstr_w(locale), debugstr_range(&range)); + + if (!locale || strlenW(locale) > LOCALE_NAME_MAX_LENGTH-1) + return E_INVALIDARG; + + if (!validate_text_range(This, &range)) + return S_OK; + + attr.range = range; + attr.u.locale = locale; + + return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_LOCALE, &attr); } static FLOAT WINAPI dwritetextlayout_GetMaxWidth(IDWriteTextLayout2 *iface) @@ -1349,19 +1372,44 @@ static HRESULT WINAPI dwritetextlayout_GetTypography(IDWriteTextLayout2 *iface, } static HRESULT WINAPI dwritetextlayout_layout_GetLocaleNameLength(IDWriteTextLayout2 *iface, - UINT32 position, UINT32* length, DWRITE_TEXT_RANGE *range) + UINT32 position, UINT32* length, DWRITE_TEXT_RANGE *r) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%u %p %p): stub\n", This, position, length, range); - return E_NOTIMPL; + struct layout_range *range; + + TRACE("(%p)->(%u %p %p)\n", This, position, length, r); + + range = get_layout_range_by_pos(This, position); + if (!range) { + *length = 0; + return S_OK; + } + + *length = strlenW(range->locale); + return return_range(range, r); } static HRESULT WINAPI dwritetextlayout_layout_GetLocaleName(IDWriteTextLayout2 *iface, - UINT32 position, WCHAR* name, UINT32 name_size, DWRITE_TEXT_RANGE *range) + UINT32 position, WCHAR* locale, UINT32 length, DWRITE_TEXT_RANGE *r) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%u %p %u %p): stub\n", This, position, name, name_size, range); - return E_NOTIMPL; + struct layout_range *range; + + TRACE("(%p)->(%u %p %u %p)\n", This, position, locale, length, r); + + if (length == 0) + return E_INVALIDARG; + + locale[0] = 0; + range = get_layout_range_by_pos(This, position); + if (!range) + return E_INVALIDARG; + + if (length < strlenW(range->locale) + 1) + return E_NOT_SUFFICIENT_BUFFER; + + strcpyW(locale, range->locale); + return return_range(range, r); } static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index de3e544..b90d7af 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -924,6 +924,72 @@ todo_wine { IDWriteTextFormat_Release(format); } +static void test_SetLocaleName(void) +{ + static const WCHAR strW[] = {'a','b','c','d',0}; + WCHAR buffW[LOCALE_NAME_MAX_LENGTH+5]; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + DWRITE_TEXT_RANGE range; + HRESULT hr; + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + range.startPosition = 0; + range.length = 1; + hr = IDWriteTextLayout_SetLocaleName(layout, enusW, range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_SetLocaleName(layout, NULL, range); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* invalid locale name is allowed */ + hr = IDWriteTextLayout_SetLocaleName(layout, strW, range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_GetLocaleName(layout, 0, NULL, 0, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + +if (0) /* crashes on native */ + hr = IDWriteTextLayout_GetLocaleName(layout, 0, NULL, 1, NULL); + + buffW[0] = 0; + hr = IDWriteTextLayout_GetLocaleName(layout, 0, buffW, sizeof(buffW)/sizeof(WCHAR), NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(buffW, strW), "got %s\n", wine_dbgstr_w(buffW)); + + /* get with a shorter buffer */ + buffW[0] = 0xa; + hr = IDWriteTextLayout_GetLocaleName(layout, 0, buffW, 1, NULL); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); + ok(buffW[0] == 0, "got %x\n", buffW[0]); + + /* name is too long */ + lstrcpyW(buffW, strW); + while (lstrlenW(buffW) < LOCALE_NAME_MAX_LENGTH) { + lstrcatW(buffW, strW); + } + lstrcatW(buffW, strW); + + range.startPosition = 0; + range.length = 1; + hr = IDWriteTextLayout_SetLocaleName(layout, buffW, range); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + buffW[0] = 0; + hr = IDWriteTextLayout_GetLocaleName(layout, 0, buffW, sizeof(buffW)/sizeof(WCHAR), NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(buffW, strW), "got %s\n", wine_dbgstr_w(buffW)); + + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); +} + START_TEST(layout) { HRESULT hr; @@ -949,6 +1015,7 @@ START_TEST(layout) test_draw_sequence(); test_typography(); test_GetClusterMetrics(); + test_SetLocaleName(); IDWriteFactory_Release(factory); }

1 0

Jon Doron : kernel32: Fix write_raw_resources to support 32 and 64 PE formats.
by Alexandre Julliard Jan. 5, 2015

Jan. 5, 2015

Module: wine Branch: master Commit: 3c28c0a2eb07ed1cf8900537dfb26ad0fbe7b3d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c28c0a2eb07ed1cf8900537d… Author: Jon Doron <arilou(a)gmail.com> Date: Thu Jan 1 16:46:58 2015 +0200 kernel32: Fix write_raw_resources to support 32 and 64 PE formats. --- dlls/kernel32/resource.c | 73 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 51 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index ecd599f..06b93db 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -850,8 +850,10 @@ static IMAGE_SECTION_HEADER *get_section_header( void *base, DWORD mapping_size, static BOOL check_pe_exe( HANDLE file, QUEUEDUPDATES *updates ) { - const IMAGE_NT_HEADERS *nt; + const IMAGE_NT_HEADERS32 *nt; + const IMAGE_NT_HEADERS64 *nt64; const IMAGE_SECTION_HEADER *sec; + const IMAGE_DATA_DIRECTORY *dd; BOOL ret = FALSE; HANDLE mapping; DWORD mapping_size, num_sections = 0; @@ -867,13 +869,18 @@ static BOOL check_pe_exe( HANDLE file, QUEUEDUPDATES *updates ) if (!base) goto done; - nt = get_nt_header( base, mapping_size ); + nt = (IMAGE_NT_HEADERS32 *)get_nt_header( base, mapping_size ); if (!nt) goto done; + nt64 = (IMAGE_NT_HEADERS64*)nt; + dd = &nt->OptionalHeader.DataDirectory[0]; + if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + dd = &nt64->OptionalHeader.DataDirectory[0]; + TRACE("resources: %08x %08x\n", - nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress, - nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size); + dd[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress, + dd[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size); sec = get_section_header( base, mapping_size, &num_sections ); if (!sec) @@ -1393,10 +1400,12 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) DWORD section_size; BOOL ret = FALSE; IMAGE_SECTION_HEADER *sec; - IMAGE_NT_HEADERS *nt; + IMAGE_NT_HEADERS32 *nt; + IMAGE_NT_HEADERS64 *nt64; struct resource_size_info res_size; BYTE *res_base; struct mapping_info *read_map = NULL, *write_map = NULL; + DWORD PeSectionAlignment, PeFileAlignment, PeSizeOfImage; /* copy the exe to a temp file then update the temp file... */ tempdir[0] = 0; @@ -1429,19 +1438,30 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) if (!write_map) goto done; - nt = get_nt_header( write_map->base, write_map->size ); + nt = (IMAGE_NT_HEADERS32*)get_nt_header( write_map->base, write_map->size ); if (!nt) goto done; - if (nt->OptionalHeader.SectionAlignment <= 0) + nt64 = (IMAGE_NT_HEADERS64*)nt; + if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) { + PeSectionAlignment = nt64->OptionalHeader.SectionAlignment; + PeFileAlignment = nt64->OptionalHeader.FileAlignment; + PeSizeOfImage = nt64->OptionalHeader.SizeOfImage; + } else { + PeSectionAlignment = nt->OptionalHeader.SectionAlignment; + PeFileAlignment = nt->OptionalHeader.FileAlignment; + PeSizeOfImage = nt->OptionalHeader.SizeOfImage; + } + + if ((LONG)PeSectionAlignment <= 0) { - ERR("invalid section alignment %04x\n", nt->OptionalHeader.SectionAlignment); + ERR("invalid section alignment %08x\n", PeSectionAlignment); goto done; } - if (nt->OptionalHeader.FileAlignment <= 0) + if ((LONG)PeFileAlignment <= 0) { - ERR("invalid file alignment %04x\n", nt->OptionalHeader.FileAlignment); + ERR("invalid file alignment %08x\n", PeFileAlignment); goto done; } @@ -1460,12 +1480,12 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) memset( sec, 0, sizeof *sec ); memcpy( sec->Name, ".rsrc", 5 ); sec->Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ; - sec->VirtualAddress = nt->OptionalHeader.SizeOfImage; + sec->VirtualAddress = PeSizeOfImage; } if (!sec->PointerToRawData) /* empty section */ { - sec->PointerToRawData = write_map->size + (-write_map->size) % nt->OptionalHeader.FileAlignment; + sec->PointerToRawData = write_map->size + (-write_map->size) % PeFileAlignment; sec->SizeOfRawData = 0; } @@ -1475,7 +1495,7 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) /* round up the section size */ section_size = res_size.total_size; - section_size += (-section_size) % nt->OptionalHeader.FileAlignment; + section_size += (-section_size) % PeFileAlignment; TRACE("requires %08x (%08x) bytes\n", res_size.total_size, section_size ); @@ -1483,10 +1503,10 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) if (section_size != sec->SizeOfRawData) { DWORD old_size = write_map->size; - DWORD virtual_section_size = res_size.total_size + (-res_size.total_size) % nt->OptionalHeader.SectionAlignment; - int delta = section_size - (sec->SizeOfRawData + (-sec->SizeOfRawData) % nt->OptionalHeader.FileAlignment); + DWORD virtual_section_size = res_size.total_size + (-res_size.total_size) % PeSectionAlignment; + int delta = section_size - (sec->SizeOfRawData + (-sec->SizeOfRawData) % PeFileAlignment); int rva_delta = virtual_section_size - - (sec->Misc.VirtualSize + (-sec->Misc.VirtualSize) % nt->OptionalHeader.SectionAlignment); + (sec->Misc.VirtualSize + (-sec->Misc.VirtualSize) % PeSectionAlignment); BOOL rsrc_is_last = sec->PointerToRawData + sec->SizeOfRawData == old_size; /* align .rsrc size when possible */ DWORD mapping_size = rsrc_is_last ? sec->PointerToRawData + section_size : old_size + delta; @@ -1502,12 +1522,13 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) ret = resize_mapping( write_map, mapping_size ); /* get the pointers again - they might be different after remapping */ - nt = get_nt_header( write_map->base, mapping_size ); + nt = (IMAGE_NT_HEADERS32*)get_nt_header( write_map->base, mapping_size ); if (!nt) { ERR("couldn't get NT header\n"); goto done; } + nt64 = (IMAGE_NT_HEADERS64*)nt; sec = get_resource_section( write_map->base, mapping_size ); if (!sec) @@ -1538,12 +1559,13 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) { ret = resize_mapping( write_map, mapping_size ); - nt = get_nt_header( write_map->base, mapping_size ); + nt = (IMAGE_NT_HEADERS32*)get_nt_header( write_map->base, mapping_size ); if (!nt) { ERR("couldn't get NT header\n"); goto done; } + nt64 = (IMAGE_NT_HEADERS64*)nt; sec = get_resource_section( write_map->base, mapping_size ); if (!sec) @@ -1553,10 +1575,17 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) /* adjust the PE header information */ sec->SizeOfRawData = section_size; sec->Misc.VirtualSize = virtual_section_size; - nt->OptionalHeader.SizeOfImage += rva_delta; - nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = sec->VirtualAddress; - nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = res_size.total_size; - nt->OptionalHeader.SizeOfInitializedData = get_init_data_size( write_map->base, mapping_size ); + if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) { + nt64->OptionalHeader.SizeOfImage += rva_delta; + nt64->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = sec->VirtualAddress; + nt64->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = res_size.total_size; + nt64->OptionalHeader.SizeOfInitializedData = get_init_data_size( write_map->base, mapping_size ); + } else { + nt->OptionalHeader.SizeOfImage += rva_delta; + nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = sec->VirtualAddress; + nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = res_size.total_size; + nt->OptionalHeader.SizeOfInitializedData = get_init_data_size( write_map->base, mapping_size ); + } } res_base = (LPBYTE) write_map->base + sec->PointerToRawData;

1 0

Mark Harmstone : winealsa: Support up to 6 channels.
by Alexandre Julliard Jan. 5, 2015

Jan. 5, 2015

Module: wine Branch: master Commit: a3f33daa6ab7156b26ad1378d49e8af6666b062d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3f33daa6ab7156b26ad1378d… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Wed Dec 31 21:34:47 2014 +0000 winealsa: Support up to 6 channels. --- dlls/winealsa.drv/mmdevdrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index d2fb2d3..2079dcc 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1830,8 +1830,8 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, goto exit; } - if(max_channels > 2) - fmt->Format.nChannels = 2; + if(max_channels > 6) + fmt->Format.nChannels = 6; else fmt->Format.nChannels = max_channels;

1 0