March 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : dwrite: Store pair kerning range attribute.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: 672aae654ee687affb11d5a43fe4e1fc549894ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=672aae654ee687affb11d5a43… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 11:25:18 2015 +0300 dwrite: Store pair kerning range attribute. --- dlls/dwrite/layout.c | 35 ++++++++++++++++++++++++----- dlls/dwrite/tests/layout.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 2665664..d26751e 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -67,6 +67,7 @@ enum layout_range_attr_kind { LAYOUT_RANGE_ATTR_INLINE, LAYOUT_RANGE_ATTR_UNDERLINE, LAYOUT_RANGE_ATTR_STRIKETHROUGH, + LAYOUT_RANGE_ATTR_PAIR_KERNING, LAYOUT_RANGE_ATTR_FONTCOLL, LAYOUT_RANGE_ATTR_LOCALE, LAYOUT_RANGE_ATTR_FONTFAMILY @@ -83,6 +84,7 @@ struct layout_range_attr_value { IUnknown *effect; BOOL underline; BOOL strikethrough; + BOOL pair_kerning; IDWriteFontCollection *collection; const WCHAR *locale; const WCHAR *fontfamily; @@ -100,6 +102,7 @@ struct layout_range { IUnknown *effect; BOOL underline; BOOL strikethrough; + BOOL pair_kerning; IDWriteFontCollection *collection; WCHAR locale[LOCALE_NAME_MAX_LENGTH]; WCHAR *fontfamily; @@ -628,6 +631,8 @@ static BOOL is_same_layout_attrvalue(struct layout_range const *range, enum layo return range->underline == value->u.underline; case LAYOUT_RANGE_ATTR_STRIKETHROUGH: return range->strikethrough == value->u.strikethrough; + case LAYOUT_RANGE_ATTR_PAIR_KERNING: + return range->pair_kerning == value->u.pair_kerning; case LAYOUT_RANGE_ATTR_FONTCOLL: return range->collection == value->u.collection; case LAYOUT_RANGE_ATTR_LOCALE: @@ -651,6 +656,7 @@ static inline BOOL is_same_layout_attributes(struct layout_range const *left, st left->effect == right->effect && left->underline == right->underline && left->strikethrough == right->strikethrough && + left->pair_kerning == right->pair_kerning && left->collection == right->collection && !strcmpW(left->locale, right->locale) && !strcmpW(left->fontfamily, right->fontfamily); @@ -678,6 +684,7 @@ static struct layout_range *alloc_layout_range(struct dwrite_textlayout *layout, range->effect = NULL; range->underline = FALSE; range->strikethrough = FALSE; + range->pair_kerning = FALSE; range->fontfamily = heap_strdupW(layout->format.family_name); if (!range->fontfamily) { @@ -823,6 +830,10 @@ static BOOL set_layout_range_attrval(struct layout_range *dest, enum layout_rang changed = dest->strikethrough != value->u.strikethrough; dest->strikethrough = value->u.strikethrough; break; + case LAYOUT_RANGE_ATTR_PAIR_KERNING: + changed = dest->pair_kerning != value->u.pair_kerning; + dest->pair_kerning = value->u.pair_kerning; + break; case LAYOUT_RANGE_ATTR_FONTCOLL: changed = set_layout_range_iface_attr((IUnknown**)&dest->collection, (IUnknown*)value->u.collection); break; @@ -1758,16 +1769,30 @@ static HRESULT WINAPI dwritetextlayout1_SetPairKerning(IDWriteTextLayout2 *iface DWRITE_TEXT_RANGE range) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%d %s): stub\n", This, is_pairkerning_enabled, debugstr_range(&range)); - return E_NOTIMPL; + struct layout_range_attr_value value; + + TRACE("(%p)->(%d %s)\n", This, is_pairkerning_enabled, debugstr_range(&range)); + + value.range = range; + value.u.pair_kerning = !!is_pairkerning_enabled; + return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_PAIR_KERNING, &value); } static HRESULT WINAPI dwritetextlayout1_GetPairKerning(IDWriteTextLayout2 *iface, UINT32 position, BOOL *is_pairkerning_enabled, - DWRITE_TEXT_RANGE *range) + DWRITE_TEXT_RANGE *r) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%p %p): stub\n", This, is_pairkerning_enabled, range); - return E_NOTIMPL; + struct layout_range *range; + + TRACE("(%p)->(%u %p %p)\n", This, position, is_pairkerning_enabled, r); + + if (position >= This->len) + return S_OK; + + range = get_layout_range_by_pos(This, position); + *is_pairkerning_enabled = range->pair_kerning; + + return return_range(range, r); } static HRESULT WINAPI dwritetextlayout1_SetCharacterSpacing(IDWriteTextLayout2 *iface, FLOAT leading_spacing, FLOAT trailing_spacing, diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 89c96e4..c796c12 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1035,6 +1035,60 @@ if (0) /* crashes on native */ IDWriteTextFormat_Release(format); } +static void test_SetPairKerning(void) +{ + static const WCHAR strW[] = {'a','b','c','d',0}; + IDWriteTextLayout1 *layout1; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + DWRITE_TEXT_RANGE range; + BOOL kerning; + 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); + IDWriteTextFormat_Release(format); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout1, (void**)&layout1); + IDWriteTextLayout_Release(layout); + + if (hr != S_OK) { + win_skip("SetPairKerning() is not supported.\n"); + return; + } + +if (0) { /* crashes on native */ + hr = IDWriteTextLayout1_GetPairKerning(layout1, 0, NULL, NULL); + hr = IDWriteTextLayout1_GetPairKerning(layout1, 0, NULL, &range); +} + + hr = IDWriteTextLayout1_GetPairKerning(layout1, 0, &kerning, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + range.startPosition = 0; + range.length = 0; + kerning = TRUE; + hr = IDWriteTextLayout1_GetPairKerning(layout1, 0, &kerning, &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!kerning, "got %d\n", kerning); + + range.startPosition = 0; + range.length = 1; + hr = IDWriteTextLayout1_SetPairKerning(layout1, 2, range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + kerning = FALSE; + hr = IDWriteTextLayout1_GetPairKerning(layout1, 0, &kerning, &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(kerning == TRUE, "got %d\n", kerning); + + IDWriteTextLayout1_Release(layout1); +} + START_TEST(layout) { HRESULT hr; @@ -1061,6 +1115,7 @@ START_TEST(layout) test_typography(); test_GetClusterMetrics(); test_SetLocaleName(); + test_SetPairKerning(); IDWriteFactory_Release(factory); }

1 0

Henri Verbeet : d3d10core: Implement d3d10_shader_resource_view_SetPrivateData().
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: b0da585aeb89695dd619603d67a5aa3183e3c306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0da585aeb89695dd619603d6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 13 09:49:24 2015 +0100 d3d10core: Implement d3d10_shader_resource_view_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/view.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 3678a45..5d02cca 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -171,6 +171,7 @@ struct d3d10_shader_resource_view ID3D10ShaderResourceView ID3D10ShaderResourceView_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_shader_resource_view *wined3d_view; D3D10_SHADER_RESOURCE_VIEW_DESC desc; ID3D10Resource *resource; diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 3576e4a..1a1c3d2 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -913,6 +913,7 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_Release(ID3D10ShaderRe wined3d_shader_resource_view_decref(This->wined3d_view); ID3D10Resource_Release(This->resource); ID3D10Device1_Release(This->device); + wined3d_private_store_cleanup(&This->private_store); HeapFree(GetProcessHeap(), 0, This); } @@ -944,10 +945,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_GetPrivateData(ID3D1 static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateData(ID3D10ShaderResourceView *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&view->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateDataInterface(ID3D10ShaderResourceView *iface, @@ -1032,6 +1035,7 @@ HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, return hr; } + wined3d_private_store_init(&view->private_store); view->resource = resource; ID3D10Resource_AddRef(resource); view->device = &device->ID3D10Device1_iface;

1 0

Alexandre Julliard : ntoskrnl: Allow running user APC inside the device manager loop.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: c40239d989075cecb2a0f58dbe122f6db2d19cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c40239d989075cecb2a0f58db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 17:02:35 2015 +0900 ntoskrnl: Allow running user APC inside the device manager loop. --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 0ba26b2..95dcdc9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -244,10 +244,15 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) /* restart with larger buffer */ break; case STATUS_PENDING: - if (WaitForMultipleObjects( 2, handles, FALSE, INFINITE ) == WAIT_OBJECT_0) + for (;;) { - HeapFree( GetProcessHeap(), 0, in_buff ); - return STATUS_SUCCESS; + DWORD ret = WaitForMultipleObjectsEx( 2, handles, FALSE, INFINITE, TRUE ); + if (ret == WAIT_OBJECT_0) + { + HeapFree( GetProcessHeap(), 0, in_buff ); + return STATUS_SUCCESS; + } + if (ret != WAIT_IO_COMPLETION) break; } break; }

1 0

Sebastian Lackner : ntdll: Implement [Nt|Zw]QueryLicenseValue.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: 2daca626d4ba4f0ba5a28ee02bf5c94ecce7282a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2daca626d4ba4f0ba5a28ee02… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 22 20:01:29 2014 +0100 ntdll: Implement [Nt|Zw]QueryLicenseValue. --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/reg.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/tests/reg.c | 2 +- include/winternl.h | 1 + 4 files changed, 68 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 9355d04..c3307b2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -255,6 +255,7 @@ @ stub NtQueryIntervalProfile @ stdcall NtQueryIoCompletion(long long ptr long ptr) @ stdcall NtQueryKey (long long ptr long ptr) +@ stdcall NtQueryLicenseValue(ptr ptr ptr long ptr) @ stdcall NtQueryMultipleValueKey(long ptr long ptr long ptr) @ stdcall NtQueryMutant(long long ptr long ptr) @ stdcall NtQueryObject(long long long long long) @@ -1134,6 +1135,7 @@ @ stub ZwQueryIntervalProfile @ stdcall ZwQueryIoCompletion(long long ptr long ptr) NtQueryIoCompletion @ stdcall ZwQueryKey(long long ptr long ptr) NtQueryKey +@ stdcall ZwQueryLicenseValue(ptr ptr ptr long ptr) NtQueryLicenseValue @ stdcall ZwQueryMultipleValueKey(long ptr long ptr long ptr) NtQueryMultipleValueKey @ stdcall ZwQueryMutant(long long ptr long ptr) NtQueryMutant @ stdcall ZwQueryObject(long long long long long) NtQueryObject diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index cdca88a..a104c2e 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -1401,3 +1401,67 @@ NTSTATUS WINAPI RtlWriteRegistryValue( ULONG RelativeTo, PCWSTR path, PCWSTR nam return status; } + +/************************************************************************* + * NtQueryLicenseValue [NTDLL.@] + * + * NOTES + * On Windows all license properties are stored in a single key, but + * unless there is some app which explicitly depends on that, there is + * no good reason to reproduce that. + */ +NTSTATUS WINAPI NtQueryLicenseValue( const UNICODE_STRING *name, ULONG *result_type, + PVOID data, ULONG length, ULONG *result_len ) +{ + static const WCHAR LicenseInformationW[] = {'M','a','c','h','i','n','e','\\', + 'S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\','L','i','c','e','n','s','e', + 'I','n','f','o','r','m','a','t','i','o','n',0}; + KEY_VALUE_PARTIAL_INFORMATION *info; + NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; + DWORD info_length, count; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING keyW; + HANDLE hkey; + + if (!name || !name->Buffer || !name->Length || !result_len) + return STATUS_INVALID_PARAMETER; + + info_length = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data) + length; + info = RtlAllocateHeap( GetProcessHeap(), 0, info_length ); + if (!info) return STATUS_NO_MEMORY; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &keyW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &keyW, LicenseInformationW ); + + /* @@ Wine registry key: HKLM\Software\Wine\LicenseInformation */ + if (!NtOpenKey( &hkey, KEY_READ, &attr )) + { + status = NtQueryValueKey( hkey, name, KeyValuePartialInformation, + info, info_length, &count ); + if (!status || status == STATUS_BUFFER_OVERFLOW) + { + if (result_type) + *result_type = info->Type; + + *result_len = info->DataLength; + + if (status == STATUS_BUFFER_OVERFLOW) + status = STATUS_BUFFER_TOO_SMALL; + else + memcpy( data, info->Data, info->DataLength ); + } + NtClose( hkey ); + } + + if (status == STATUS_OBJECT_NAME_NOT_FOUND) + FIXME( "License key %s not found\n", debugstr_w(name->Buffer) ); + + RtlFreeHeap( GetProcessHeap(), 0, info ); + return status; +} diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 4628f16..691a6b7 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -661,7 +661,7 @@ static void test_NtQueryLicenseKey(void) if (!pNtQueryLicenseValue) { - skip("NtQueryLicenseValue not found, skipping tests\n"); + win_skip("NtQueryLicenseValue not found, skipping tests\n"); return; } diff --git a/include/winternl.h b/include/winternl.h index 3992309..6dc8c74 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2189,6 +2189,7 @@ NTSYSAPI NTSTATUS WINAPI NtQuerySystemTime(PLARGE_INTEGER); NTSYSAPI NTSTATUS WINAPI NtQueryTimer(HANDLE,TIMER_INFORMATION_CLASS,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQueryTimerResolution(PULONG,PULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQueryValueKey(HANDLE,const UNICODE_STRING *,KEY_VALUE_INFORMATION_CLASS,void *,DWORD,DWORD *); +NTSYSAPI NTSTATUS WINAPI NtQueryLicenseValue(const UNICODE_STRING *,ULONG *,PVOID,ULONG,ULONG *); NTSYSAPI NTSTATUS WINAPI NtQueryVirtualMemory(HANDLE,LPCVOID,MEMORY_INFORMATION_CLASS,PVOID,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI NtQueryVolumeInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS); NTSYSAPI NTSTATUS WINAPI NtRaiseException(PEXCEPTION_RECORD,PCONTEXT,BOOL);

1 0

Francois Gouget : mmdevapi: Remove an uneeded NONAMELESSUNION directive.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: 1ba0d43b6e8a306f259bc8f20a27f8692700c998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ba0d43b6e8a306f259bc8f20… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 10:32:47 2015 +0100 mmdevapi: Remove an uneeded NONAMELESSUNION directive. --- dlls/mmdevapi/audiovolume.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 4cc3226..194cfa3 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#define NONAMELESSUNION #define COBJMACROS #include "config.h"

1 0

Francois Gouget : localspl: Remove uneeded NONAMELESSUNION directives.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: dc9684b6632024dda96e06c6ddfad18737b48235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc9684b6632024dda96e06c6d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 10:31:58 2015 +0100 localspl: Remove uneeded NONAMELESSUNION directives. --- dlls/localspl/localmon.c | 1 - dlls/localspl/localspl_main.c | 1 - dlls/localspl/provider.c | 1 - 3 files changed, 3 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 8737a06..4ee3efb 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -21,7 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c index d4a3c33..48db9c3 100644 --- a/dlls/localspl/localspl_main.c +++ b/dlls/localspl/localspl_main.c @@ -21,7 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 8256c5c..b5fcdb1 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -21,7 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h"

1 0

Piotr Caban : windowscodecs: Show that WIC doesn' t do GIF frames composition.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: 02d4c6b5acf58900811d5ffc6e38f4d0616a7142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02d4c6b5acf58900811d5ffc6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 12 10:18:51 2015 +0100 windowscodecs: Show that WIC doesn't do GIF frames composition. --- dlls/windowscodecs/tests/gifformat.c | 72 ++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index 863a91f..5b4cd8bc 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -57,6 +57,27 @@ static const char gif_local_palette[] = { 0x02,0x02,0x44,0x01,0x00,0x3b }; +/* Generated with ImageMagick: + * convert -delay 100 -size 2x2 xc:red \ + * -dispose none -page +0+0 -size 2x1 xc:white \ + * test.gif + */ +static const char gif_frame_sizes[] = { + 0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x02, 0x00, + 0x02, 0x00, 0xf1, 0x00, 0x00, 0xff, 0x00, 0x00, + 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, + 0x00, 0x21, 0xf9, 0x04, 0x00, 0x64, 0x00, 0x00, + 0x00, 0x21, 0xff, 0x0b, 0x4e, 0x45, 0x54, 0x53, + 0x43, 0x41, 0x50, 0x45, 0x32, 0x2e, 0x30, 0x03, + 0x01, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00, + 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x02, 0x03, + 0x44, 0x34, 0x05, 0x00, 0x21, 0xf9, 0x04, 0x04, + 0x64, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00, + 0x00, 0x02, 0x00, 0x01, 0x00, 0x80, 0xff, 0xff, + 0xff, 0x00, 0x00, 0x00, 0x02, 0x02, 0x04, 0x0a, + 0x00, 0x3b +}; + static IWICImagingFactory *factory; static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size) @@ -332,6 +353,55 @@ static void test_local_gif_palette(void) IWICBitmapDecoder_Release(decoder); } +static void test_gif_frame_sizes(void) +{ + static const BYTE frame0[] = {0, 1, 0xfe, 0xfe, 2, 3, 0xfe, 0xfe}; + static const BYTE frame1[] = {0, 0, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe}; + + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + UINT width, height; + BYTE buf[8]; + HRESULT hr; + + decoder = create_decoder(gif_frame_sizes, sizeof(gif_frame_sizes)); + ok(decoder != 0, "Failed to load GIF image data\n"); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetSize(frame, &width, &height); + ok(hr == S_OK, "GetSize error %x\n", hr); + ok(width == 2, "width = %d\n", width); + ok(height == 2, "height = %d\n", height); + + memset(buf, 0xfe, sizeof(buf)); + hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, 4, sizeof(buf), buf); + ok(hr == S_OK, "CopyPixels error %x\n", hr); + ok(!memcmp(buf, frame0, sizeof(buf)), "buf = %x %x %x %x %x %x %x %x\n", + buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6], buf[7]); + + IWICBitmapFrameDecode_Release(frame); + + hr = IWICBitmapDecoder_GetFrame(decoder, 1, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetSize(frame, &width, &height); + ok(hr == S_OK, "GetSize error %x\n", hr); + ok(width == 2, "width = %d\n", width); + ok(height == 1, "height = %d\n", height); + + memset(buf, 0xfe, sizeof(buf)); + hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, 4, sizeof(buf), buf); + ok(hr == S_OK, "CopyPixels error %x\n", hr); + ok(!memcmp(buf, frame1, sizeof(buf)), "buf = %x %x %x %x %x %x %x %x\n", + buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6], buf[7]); + + IWICBitmapFrameDecode_Release(frame); + + IWICBitmapDecoder_Release(decoder); +} + START_TEST(gifformat) { HRESULT hr; @@ -345,6 +415,7 @@ START_TEST(gifformat) test_global_gif_palette(); test_global_gif_palette_2frames(); test_local_gif_palette(); + test_gif_frame_sizes(); IWICImagingFactory_Release(factory); CoUninitialize(); @@ -356,6 +427,7 @@ START_TEST(gifformat) test_global_gif_palette(); test_global_gif_palette_2frames(); test_local_gif_palette(); + test_gif_frame_sizes(); IWICImagingFactory_Release(factory); }

1 0

Piotr Caban : gdiplus: Add pixel format test for transparent non-animated gif.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: 3ece08ff4d3ee3f1ed2067ad53b77e8bc00f81e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ece08ff4d3ee3f1ed2067ad5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 12 10:19:05 2015 +0100 gdiplus: Add pixel format test for transparent non-animated gif. --- dlls/gdiplus/tests/image.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index cc8ae2d..91f70b5 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1335,6 +1335,12 @@ static const unsigned char gifimage[35] = { 0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x44, 0x01,0x00,0x3b }; +/* 1x1 pixel transparent gif */ +static const unsigned char transparentgif[] = { +0x47,0x49,0x46,0x38,0x39,0x61,0x01,0x00,0x01,0x00,0xf0,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x21,0xf9,0x04,0x01,0x00,0x00,0x00,0x00,0x2c,0x00,0x00,0x00,0x00, +0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x44,0x01,0x00,0x3b +}; /* 1x1 pixel bmp */ static const unsigned char bmpimage[66] = { 0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, @@ -2621,6 +2627,30 @@ static void test_multiframegif(void) GdipDisposeImage((GpImage*)bmp); IStream_Release(stream); + /* Test with a non-animated transparent gif */ + hglob = GlobalAlloc (0, sizeof(transparentgif)); + data = GlobalLock (hglob); + memcpy(data, transparentgif, sizeof(transparentgif)); + GlobalUnlock(hglob); + + hres = CreateStreamOnHGlobal(hglob, TRUE, &stream); + ok(hres == S_OK, "Failed to create a stream\n"); + + stat = GdipCreateBitmapFromStream(stream, &bmp); + IStream_Release(stream); + ok(stat == Ok, "Failed to create a Bitmap\n"); + + stat = GdipGetImagePixelFormat((GpImage*)bmp, &pixel_format); + expect(Ok, stat); + expect(PixelFormat8bppIndexed, pixel_format); + + count = 12345; + stat = GdipImageGetFrameCount((GpImage*)bmp, &dimension, &count); + expect(Ok, stat); + expect(1, count); + + GdipDisposeImage((GpImage*)bmp); + /* Test frame dispose methods */ hglob = GlobalAlloc (0, sizeof(gifanimation2)); data = GlobalLock (hglob);

1 0

Sebastian Lackner : wine.inf: Add some LicenseInformation registry values.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: dc0f544d6718589a6725d68d69132f897f45cdf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0f544d6718589a6725d68d6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 11 02:14:54 2015 +0100 wine.inf: Add some LicenseInformation registry values. On Windows all the license information key/value pairs are stored in a single registry blob. The format is not properly documented, and unless we have some apps which expect it, there should be no need to spend too much time to figure out the internal details. --- loader/wine.inf.in | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index a4548f2..3c401b1 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -47,7 +47,8 @@ AddReg=\ Services, \ SessionMgr,\ Tapi,\ - Timezones + Timezones,\ + LicenseInformation [DefaultInstall.NT] RegisterDlls=RegisterDllsSection @@ -71,7 +72,8 @@ AddReg=\ SessionMgr,\ Tapi,\ Timezones,\ - VersionInfo + VersionInfo,\ + LicenseInformation [DefaultInstall.ntamd64] RegisterDlls=RegisterDllsSection @@ -97,7 +99,8 @@ AddReg=\ SessionMgr,\ Tapi,\ Timezones,\ - VersionInfo.ntamd64 + VersionInfo.ntamd64,\ + LicenseInformation [Wow64Install] RegisterDlls=RegisterDllsSection @@ -111,7 +114,8 @@ AddReg=\ MCI,\ Misc,\ Tapi,\ - VersionInfo.ntamd64 + VersionInfo.ntamd64,\ + LicenseInformation [DefaultInstall.Services] AddService=BITS,0,BITSService @@ -3140,3 +3144,17 @@ HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\Time Zones,"Symbol HKLM,Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Time Zones,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Windows NT\CurrentVersion\Time Zones" HKLM,Software\Wow6432Node\Policies,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Policies" HKLM,Software\Wow6432Node\Registered Applications,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Registered Applications" + +[LicenseInformation] +; based on information from http://www.geoffchappell.com/notes/windows/license/install.htm +HKLM,Software\Wine\LicenseInformation,"Kernel-MUI-Language-Allowed",,"EMPTY" +HKLM,Software\Wine\LicenseInformation,"Kernel-MUI-Language-Disallowed",,"EMPTY" +HKLM,Software\Wine\LicenseInformation,"Kernel-MUI-Number-Allowed",0x10001,1000 +HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-FreeCell-EnableGame",0x10001,0x00000001 +HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Hearts-EnableGame",0x10001,0x00000001 +HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Minesweeper-EnableGame",0x10001,0x00000001 +HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-PurblePlace-EnableGame",0x10001,0x00000001 +HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Shanghai-EnableGame",0x10001,0x00000001 +HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Solitaire-EnableGame",0x10001,0x00000001 +HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGame",0x10001,0x00000001 +HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001

1 0

Austin English : include/winternl.h: Use ntdef.h where possible.
by Alexandre Julliard March 13, 2015

March 13, 2015

Module: wine Branch: master Commit: 33e9798f721587fc08232734d6743ea0afb4afdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e9798f721587fc08232734d… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Mar 12 15:48:02 2015 -0500 include/winternl.h: Use ntdef.h where possible. --- include/winternl.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index 6dc8c74..f88001f 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -21,6 +21,7 @@ #ifndef __WINE_WINTERNL_H #define __WINE_WINTERNL_H +#include <ntdef.h> #include <windef.h> #ifdef __cplusplus @@ -813,11 +814,6 @@ typedef enum _SYSTEM_INFORMATION_CLASS { SystemInformationClassMax } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; -typedef enum _TIMER_TYPE { - NotificationTimer, - SynchronizationTimer -} TIMER_TYPE; - typedef enum _THREADINFOCLASS { ThreadBasicInformation, ThreadTimes, @@ -1762,11 +1758,6 @@ typedef VOID (CALLBACK *PRTL_OVERLAPPED_COMPLETION_ROUTINE)(DWORD,DWORD,LPVOID); typedef VOID (CALLBACK *PTIMER_APC_ROUTINE) ( PVOID, ULONG, LONG ); -typedef enum _EVENT_TYPE { - NotificationEvent, - SynchronizationEvent -} EVENT_TYPE, *PEVENT_TYPE; - typedef enum _EVENT_INFORMATION_CLASS { EventBasicInformation } EVENT_INFORMATION_CLASS, *PEVENT_INFORMATION_CLASS;

1 0