June 2017 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : oledb32: Add support for converting to W/ STR types in GetConversionSize.
by Alexandre Julliard June 22, 2017

June 22, 2017

Module: wine Branch: master Commit: 23b5640b3286e71b9f9ea78aaa131298281469f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23b5640b3286e71b9f9ea78aa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 21 00:32:50 2017 +0000 oledb32: Add support for converting to W/STR types in GetConversionSize. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 24 ++++++++++++ dlls/oledb32/tests/convert.c | 88 ++++++++++++++++++++++---------------------- 2 files changed, 68 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23b5640b3286e71b9f9ea…

1 0

Alistair Leslie-Hughes : oledb32: Add FIXME for DBTYPE_NUMERIC type.
by Alexandre Julliard June 22, 2017

June 22, 2017

Module: wine Branch: master Commit: 6e148790f4ae852be437f4cb40d4ef63fa6c0c3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e148790f4ae852be437f4cb4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 21 00:32:58 2017 +0000 oledb32: Add FIXME for DBTYPE_NUMERIC type. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 59b2ecd..d959f65 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -1081,7 +1081,10 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } break; } - break; + + case DBTYPE_NUMERIC: + FIXME("Unimplemented conversion %04x -> DBTYPE_NUMERIC\n", src_type); + return E_NOTIMPL; default: FIXME("Unimplemented conversion %04x -> %04x\n", src_type, dst_type);

1 0

Paul Gofman : d3dx9/tests: Modify transpose boolean matrix test to reproduce the case of incomplete last row.
by Alexandre Julliard June 21, 2017

June 21, 2017

Module: wine Branch: master Commit: 5cbc84e51eca1a8ce35916ddeebe79b4ccbd761d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cbc84e51eca1a8ce35916dde… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Jun 19 12:24:22 2017 +0300 d3dx9/tests: Modify transpose boolean matrix test to reproduce the case of incomplete last row. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index d75c5ce..2a78074 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3230,7 +3230,7 @@ PS_OUTPUT RenderScenePS( VS_OUTPUT In, uniform bool2x3 mb) Output.RGBColor.xy += mul(Output.RGBColor, m3x2column); Output.RGBColor.xy += mul(Output.RGBColor, m3x2row); } - if (mb2x3column[0][1]) + if (mb2x3column[0][0]) { Output.RGBColor += sin(Output.RGBColor); Output.RGBColor += cos(Output.RGBColor); @@ -3486,7 +3486,7 @@ static const DWORD test_effect_preshader_effect_blob[] = 0x00000002, 0x00000118, 0x00000128, 0x00000148, 0x00060002, 0x00000002, 0x00000150, 0x00000160, 0x00000180, 0x00000002, 0x00000003, 0x0000018c, 0x0000019c, 0x000001cc, 0x000a0002, 0x00000002, 0x000001d4, 0x000001e4, 0x00000204, 0x000c0002, 0x00000002, 0x00000210, 0x00000220, 0x00000240, - 0x00030002, 0x00000003, 0x00000248, 0x00000258, 0x00000288, 0x00050000, 0x00000002, 0x00000294, + 0x00030002, 0x00000003, 0x00000248, 0x00000258, 0x00000288, 0x00050000, 0x00000001, 0x00000294, 0x000002a4, 0x000002bc, 0x00000000, 0x00000005, 0x000002c8, 0x000002a4, 0x000002d8, 0x00000003, 0x00000001, 0x000002e4, 0x00000000, 0x56695f67, 0x00746365, 0x00020001, 0x00040001, 0x00000001, 0x00000000, 0x00000004, 0x00000003, 0x00000002, 0x00000001, 0x3278326d, 0x756c6f63, 0xab006e6d, @@ -3543,7 +3543,7 @@ static const DWORD test_effect_preshader_effect_blob[] = 0x80e40003, 0xa0e4000d, 0x03000002, 0x80030000, 0x80e40000, 0x80e40003, 0x03000005, 0x800c0000, 0x80550000, 0xa0440004, 0x04000004, 0x800c0000, 0x80000000, 0xa0440003, 0x80e40000, 0x04000004, 0x800c0000, 0x80aa0003, 0xa0440005, 0x80e40000, 0x03000002, 0x80030003, 0x80ee0000, 0x80e40000, - 0x0000002a, 0x02000001, 0x80080003, 0x90ff0001, 0x0000002b, 0x01000028, 0xe0e40806, 0x04000004, + 0x0000002a, 0x02000001, 0x80080003, 0x90ff0001, 0x0000002b, 0x01000028, 0xe0e40805, 0x04000004, 0x800f0000, 0x80e40003, 0xa0550010, 0xa0aa0010, 0x02000013, 0x800f0000, 0x80e40000, 0x04000004, 0x800f0000, 0x80e40000, 0xa000000f, 0xa055000f, 0x03000005, 0x800f0000, 0x80e40000, 0x80e40000, 0x04000004, 0x800f0002, 0x80e40000, 0xa0aa000f, 0xa0ff000f, 0x04000004, 0x800f0002, 0x80e40000, @@ -4317,7 +4317,7 @@ got (%g, %g, %g, %g), parameter %s.\n", static const BOOL test_effect_preshader_bconsts[] = { - TRUE, FALSE, TRUE, FALSE, TRUE, TRUE, FALSE + TRUE, FALSE, TRUE, FALSE, TRUE, TRUE }; static void test_effect_preshader_clear_pbool_consts(IDirect3DDevice9 *device) @@ -6057,7 +6057,7 @@ static void test_effect_state_manager(IDirect3DDevice9 *device) {14, 0, 0}, {15, 0, 14}, {16, 0, 1}, - {17, 0, 7}, + {17, 0, 6}, }; static D3DLIGHT9 light_filler = {D3DLIGHT_DIRECTIONAL, {0.5f, 0.5f, 0.5f, 0.5f}, {0.5f, 0.5f, 0.5f, 0.5f}, {0.5f, 0.5f, 0.5f, 0.5f}};

1 0

Matteo Bruni : d3dx9: Make the assert() in regstore_set_values() a bit more strict.
by Alexandre Julliard June 21, 2017

June 21, 2017

Module: wine Branch: master Commit: bd7a12b23c51f19ee67beefa2512e4516d1a9850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7a12b23c51f19ee67beefa2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 21 21:54:21 2017 +0200 d3dx9: Make the assert() in regstore_set_values() a bit more strict. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 2785ca3..7ca0c8f 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -372,14 +372,17 @@ static void regstore_set_modified(struct d3dx_regstore *rs, unsigned int table, static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, const void *data, unsigned int start_offset, unsigned int count) { - void *out; + BYTE *dst = rs->tables[table]; + const BYTE *src = data; + unsigned int size; if (!count) return; - out = (BYTE *)rs->tables[table] + start_offset * table_info[table].component_size; - assert(data != out); - memcpy(out, data, count * table_info[table].component_size); + dst += start_offset * table_info[table].component_size; + size = count * table_info[table].component_size; + assert((src < dst && size <= dst - src) || (src > dst && size <= src - dst)); + memcpy(dst, src, size); regstore_set_modified(rs, table, start_offset, count); }

1 0

Austin English : ntoskrnl.exe: Add KeReleaseSpinLock stub.
by Alexandre Julliard June 21, 2017

June 21, 2017

Module: wine Branch: master Commit: 362ceb2e5625c2a2162c6c5b432a36fc45b7ca1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=362ceb2e5625c2a2162c6c5b4… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jun 21 13:29:37 2017 -0500 ntoskrnl.exe: Add KeReleaseSpinLock stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.spec | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 414e49b..ae706e0 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -76,7 +76,7 @@ @ stub KeRaiseIrql @ stub KeRaiseIrqlToDpcLevel @ stub KeRaiseIrqlToSynchLevel -@ stub KeReleaseSpinLock +@ stdcall KeReleaseSpinLock(ptr long) ntoskrnl.exe.KeReleaseSpinLock @ stub KeStallExecutionProcessor @ stub READ_PORT_BUFFER_UCHAR @ stub READ_PORT_BUFFER_ULONG diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6287967..105bb7d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3251,3 +3251,11 @@ KIRQL WINAPI KeAcquireSpinLockRaiseToDpc(KSPIN_LOCK *spinlock) FIXME( "stub: %p\n", spinlock ); return 0; } + +/*********************************************************************** + * KeReleaseSpinLock (NTOSKRNL.EXE.@) + */ +VOID WINAPI KeReleaseSpinLock( KSPIN_LOCK *spinlock, KIRQL irql ) +{ + FIXME( "stub: %p %u\n", spinlock, irql ); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index aba5cb5..339e7c5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -592,6 +592,7 @@ @ stub KeReleaseMutant @ stdcall KeReleaseMutex(ptr long) @ stdcall KeReleaseSemaphore(ptr long long long) +@ stdcall KeReleaseSpinLock(ptr long) @ stub KeReleaseSpinLockFromDpcLevel @ stub KeRemoveByKeyDeviceQueue @ stub KeRemoveByKeyDeviceQueueIfBusy

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICMetadataQueryReader:: GetContainerFormat.
by Alexandre Julliard June 21, 2017

June 21, 2017

Module: wine Branch: master Commit: f25890357b8d897f67ceae7a43419f1a1c44c171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f25890357b8d897f67ceae7a4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:37:22 2017 +0800 windowscodecs: Implement IWICMetadataQueryReader::GetContainerFormat. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index 8e58684..29df42e 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -89,12 +89,13 @@ static ULONG WINAPI mqr_Release(IWICMetadataQueryReader *iface) return ref; } -static HRESULT WINAPI mqr_GetContainerFormat(IWICMetadataQueryReader *iface, - GUID *pguidContainerFormat) +static HRESULT WINAPI mqr_GetContainerFormat(IWICMetadataQueryReader *iface, GUID *format) { QueryReader *This = impl_from_IWICMetadataQueryReader(iface); - FIXME("(%p,%p)\n", This, pguidContainerFormat); - return E_NOTIMPL; + + TRACE("(%p,%p)\n", This, format); + + return IWICMetadataBlockReader_GetContainerFormat(This->block, format); } static HRESULT WINAPI mqr_GetLocation(IWICMetadataQueryReader *iface,

1 0

Dmitry Timoshkov : windowscodecs: Implement WICMapSchemaToName.
by Alexandre Julliard June 21, 2017

June 21, 2017

Module: wine Branch: master Commit: 714175e1448c5b615b1658275c86296445e6c0b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=714175e1448c5b615b1658275… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 20 12:37:18 2017 +0800 windowscodecs: Implement WICMapSchemaToName. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 127 ++++++++++++++++++++++ dlls/windowscodecs/tests/metadata.c | 196 ++++++++++++++++++++++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 2 +- include/wincodec.idl | 1 + 4 files changed, 325 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=714175e1448c5b615b165…

1 0

Hugh McMaster : regedit: Display data for all values in the GUI.
by Alexandre Julliard June 21, 2017

June 21, 2017

Module: wine Branch: master Commit: 4a70d335528e390c50206478eba16052c17b566c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a70d335528e390c50206478e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 21 12:19:27 2017 +0000 regedit: Display data for all values in the GUI. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index a3bc72f..b758564 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -129,8 +129,13 @@ void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD siz ListView_SetItemTextW(hwndLV, index, 2, buf); break; } + case REG_MULTI_SZ: + MakeMULTISZDisplayable(data); + ListView_SetItemTextW(hwndLV, index, 2, data); + break; case REG_BINARY: case REG_NONE: + default: { unsigned int i; BYTE *pData = data; @@ -143,17 +148,6 @@ void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD siz HeapFree(GetProcessHeap(), 0, strBinary); break; } - case REG_MULTI_SZ: - MakeMULTISZDisplayable(data); - ListView_SetItemTextW(hwndLV, index, 2, data); - break; - default: - { - WCHAR szText[128]; - LoadStringW(hInst, IDS_REGISTRY_VALUE_CANT_DISPLAY, szText, COUNT_OF(szText)); - ListView_SetItemTextW(hwndLV, index, 2, szText); - break; - } } }

1 0

Alexandre Julliard : wineandroid: Add a stub implementation of ChangeDisplaySettingsEx.
by Alexandre Julliard June 21, 2017

June 21, 2017

Module: wine Branch: master Commit: 508d7a33e38ab5faf524327b7680132accc83e98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=508d7a33e38ab5faf524327b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 21 15:53:40 2017 +0200 wineandroid: Add a stub implementation of ChangeDisplaySettingsEx. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/init.c | 11 +++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 12 insertions(+) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 871e41d..75905a4 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -207,6 +207,17 @@ static INT ANDROID_GetDeviceCaps( PHYSDEV dev, INT cap ) /*********************************************************************** + * ANDROID_ChangeDisplaySettingsEx + */ +LONG CDECL ANDROID_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, + HWND hwnd, DWORD flags, LPVOID lpvoid ) +{ + FIXME( "(%s,%p,%p,0x%08x,%p)\n", debugstr_w( devname ), devmode, hwnd, flags, lpvoid ); + return DISP_CHANGE_SUCCESSFUL; +} + + +/*********************************************************************** * ANDROID_GetMonitorInfo */ BOOL CDECL ANDROID_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 918140f..8e98baa 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -9,6 +9,7 @@ @ cdecl MapVirtualKeyEx(long long long) ANDROID_MapVirtualKeyEx @ cdecl ToUnicodeEx(long long ptr ptr long long long) ANDROID_ToUnicodeEx @ cdecl VkKeyScanEx(long long) ANDROID_VkKeyScanEx +@ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) ANDROID_ChangeDisplaySettingsEx @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) ANDROID_GetMonitorInfo @ cdecl CreateWindow(long) ANDROID_CreateWindow

1 0

Hans Leidekker : winhttp: Only read as much data as advertized when draining content.
by Alexandre Julliard June 21, 2017

June 21, 2017

Module: wine Branch: master Commit: 09238973e82bdb9e17637319c02389f7d0db0b48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09238973e82bdb9e17637319c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 21 09:39:10 2017 +0200 winhttp: Only read as much data as advertized when draining content. Fixes a regression caused by 2fa86fd6616e1671dd3ecfa3d2d6eaccf10be994. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index db6d12d..f35d73b 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1302,13 +1302,20 @@ done: /* read any content returned by the server so that the connection can be reused */ static void drain_content( request_t *request ) { - DWORD bytes_read; + DWORD size, bytes_read, bytes_total = 0, bytes_left = request->content_length - request->content_read; char buffer[2048]; refill_buffer( request, FALSE ); for (;;) { - if (!read_data( request, buffer, sizeof(buffer), &bytes_read, FALSE ) || !bytes_read) return; + if (request->read_chunked) size = sizeof(buffer); + else + { + if (bytes_total >= bytes_left) return; + size = min( sizeof(buffer), bytes_left - bytes_total ); + } + if (!read_data( request, buffer, size, &bytes_read, FALSE ) || !bytes_read) return; + bytes_total += bytes_read; } }

1 0