September 2015 - Wine-commits

Hans Leidekker : webservices: Implement WsGetHeapProperty.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: 9061ee4e8c78f058c15d3dc85b385a8d77a131a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9061ee4e8c78f058c15d3dc85… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 14 14:04:27 2015 +0200 webservices: Implement WsGetHeapProperty. --- dlls/webservices/reader.c | 23 +++++++++++++ dlls/webservices/tests/reader.c | 72 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 3084fe5..a0123aa 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -200,6 +200,15 @@ static HRESULT set_heap_prop( struct heap *heap, WS_HEAP_PROPERTY_ID id, const v return S_OK; } +static HRESULT get_heap_prop( struct heap *heap, WS_HEAP_PROPERTY_ID id, void *buf, ULONG size ) +{ + if (id >= heap->prop_count || size != heap_props[id].size) + return E_INVALIDARG; + + memcpy( buf, heap->prop[id].value, heap->prop[id].valueSize ); + return S_OK; +} + /************************************************************************** * WsCreateHeap [webservices.@] */ @@ -254,6 +263,20 @@ HRESULT WINAPI WsGetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, vo } /************************************************************************** + * WsGetHeapProperty [webservices.@] + */ +HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void *buf, + ULONG size, WS_ERROR *error ) +{ + struct heap *heap = (struct heap *)handle; + + TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + return get_heap_prop( heap, id, buf, size ); +} + +/************************************************************************** * WsSetErrorProperty [webservices.@] */ HRESULT WINAPI WsSetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, const void *value, diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 0db68a0..4b247d9 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -112,7 +112,79 @@ static void test_WsCreateError(void) ok( hr == E_INVALIDARG, "got %08x\n", hr ); } +static void test_WsCreateHeap(void) +{ + HRESULT hr; + WS_HEAP *heap; + WS_HEAP_PROPERTY prop; + SIZE_T max, trim, requested, actual; + ULONG size; + + hr = WsCreateHeap( 0, 0, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + heap = NULL; + hr = WsCreateHeap( 0, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( heap != NULL, "heap not set\n" ); + WsFreeHeap( heap ); + + hr = WsCreateHeap( 1 << 16, 1 << 6, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + heap = NULL; + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( heap != NULL, "heap not set\n" ); + WsFreeHeap( heap ); + + hr = WsCreateHeap( 1 << 16, 1 << 6, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + max = 0xdeadbeef; + size = sizeof(max); + hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_MAX_SIZE, &max, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( max == 1 << 16, "got %u\n", (ULONG)max ); + + trim = 0xdeadbeef; + size = sizeof(trim); + hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_TRIM_SIZE, &trim, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( trim == 1 << 6, "got %u\n", (ULONG)trim ); + + requested = 0xdeadbeef; + size = sizeof(requested); + hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_REQUESTED_SIZE, &requested, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !requested, "got %u\n", (ULONG)requested ); + + actual = 0xdeadbeef; + size = sizeof(actual); + hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_ACTUAL_SIZE, &actual, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !actual, "got %u\n", (ULONG)actual ); + + actual = 0xdeadbeef; + size = sizeof(actual); + hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_ACTUAL_SIZE + 1, &actual, size, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( actual == 0xdeadbeef, "got %u\n", (ULONG)actual ); + WsFreeHeap( heap ); + + max = 1 << 16; + prop.id = WS_HEAP_PROPERTY_MAX_SIZE; + prop.value = &max; + prop.valueSize = sizeof(max); + hr = WsCreateHeap( 1 << 16, 1 << 6, &prop, 1, &heap, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateHeap( 1 << 16, 1 << 6, NULL, 1, &heap, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); +} + START_TEST(reader) { test_WsCreateError(); + test_WsCreateHeap(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 4136dcc..4cb35f6 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -68,7 +68,7 @@ @ stub WsGetFaultErrorProperty @ stub WsGetHeader @ stub WsGetHeaderAttributes -@ stub WsGetHeapProperty +@ stdcall WsGetHeapProperty(ptr long ptr long ptr) @ stub WsGetListenerProperty @ stub WsGetMappedHeader @ stub WsGetMessageProperty

1 0

Andrew Eikum : xaudio2: Support looping buffers.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: c28bfbc5b274e9009060fafa6ffaab7375c46014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c28bfbc5b274e9009060fafa6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Sep 11 10:55:58 2015 -0500 xaudio2: Support looping buffers. Also shorten up the test runtime. --- dlls/xaudio2_7/tests/xaudio2.c | 265 ++++++++++++++++++++++++++++++++++++++++- dlls/xaudio2_7/xaudio_dll.c | 132 ++++++++++++++++++-- 2 files changed, 382 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c28bfbc5b274e9009060f…

1 0

Vincent Povirk : comdlg32: Fix ignored out parameter.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: bbe009778ef8894bf70a5dacd6def04bbcb85477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbe009778ef8894bf70a5dacd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 11 11:17:52 2015 -0500 comdlg32: Fix ignored out parameter. --- dlls/comdlg32/itemdlg.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 8a52d71..c8340df 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -804,6 +804,8 @@ static HRESULT add_item(customctrl* parent, DWORD itemid, LPCWSTR label, cctrl_i item->cdcstate = CDCS_VISIBLE|CDCS_ENABLED; list_add_tail(&parent->sub_items, &item->entry); + *result = item; + return S_OK; }

1 0

Vincent Povirk : comdlg32: Remove fixme from EnableOpenDropDown.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: 3fc57e7b49a97816344d9706eec4b85550b88892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fc57e7b49a97816344d9706e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 9 14:18:33 2015 -0500 comdlg32: Remove fixme from EnableOpenDropDown. --- dlls/comdlg32/itemdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index c8340df..e9d72cb 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -3582,7 +3582,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnEnableOpenDropDown(IFileDialogCusto { FileDialogImpl *This = impl_from_IFileDialogCustomize(iface); MENUINFO mi; - FIXME("semi-stub - %p (%d)\n", This, dwIDCtl); + TRACE("%p (%d)\n", This, dwIDCtl); if (This->hmenu_opendropdown || get_cctrl(This, dwIDCtl)) return E_UNEXPECTED;

1 0

Vincent Povirk : comdlg32: Return success from IFileDialog2::AddPlace.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: 4270a8a4dc55e2f99b5d1c721bdfbc778cf9e5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4270a8a4dc55e2f99b5d1c721… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 9 14:23:55 2015 -0500 comdlg32: Return success from IFileDialog2::AddPlace. --- dlls/comdlg32/itemdlg.c | 2 +- dlls/comdlg32/tests/itemdlg.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index e9d72cb..8ca3064 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -2554,7 +2554,7 @@ static HRESULT WINAPI IFileDialog2_fnAddPlace(IFileDialog2 *iface, IShellItem *p { FileDialogImpl *This = impl_from_IFileDialog2(iface); FIXME("stub - %p (%p, %d)\n", This, psi, fdap); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI IFileDialog2_fnSetDefaultExtension(IFileDialog2 *iface, LPCWSTR pszDefaultExtension) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 5d8e410..45e9776 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -778,22 +778,19 @@ static void test_basics(void) IFileSaveDialog_AddPlace(pfsd, NULL, 0); } - todo_wine - { hr = IFileOpenDialog_AddPlace(pfod, psidesktop, FDAP_TOP + 1); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + todo_wine ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = IFileOpenDialog_AddPlace(pfod, psidesktop, FDAP_BOTTOM); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileOpenDialog_AddPlace(pfod, psidesktop, FDAP_TOP); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileSaveDialog_AddPlace(pfsd, psidesktop, FDAP_TOP + 1); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + todo_wine ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = IFileSaveDialog_AddPlace(pfsd, psidesktop, FDAP_BOTTOM); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileSaveDialog_AddPlace(pfsd, psidesktop, FDAP_TOP); ok(hr == S_OK, "got 0x%08x\n", hr); - } /* SetFileName */ hr = IFileOpenDialog_SetFileName(pfod, NULL);

1 0

Vincent Povirk : comdlg32: Return success from IFileDialogCustomize:: MakeProminent.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: 9068f2d10cac2b95ae1e983a8171b20cc39878d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9068f2d10cac2b95ae1e983a8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 9 14:24:13 2015 -0500 comdlg32: Return success from IFileDialogCustomize::MakeProminent. --- dlls/comdlg32/itemdlg.c | 2 +- dlls/comdlg32/tests/itemdlg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 8ca3064..aa42bf3 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -4302,7 +4302,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnMakeProminent(IFileDialogCustomize { FileDialogImpl *This = impl_from_IFileDialogCustomize(iface); FIXME("stub - %p (%d)\n", This, dwIDCtl); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI IFileDialogCustomize_fnSetControlItemText(IFileDialogCustomize *iface, diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 45e9776..4649620 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -2233,7 +2233,7 @@ static void test_customize(void) ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); hr = IFileDialogCustomize_MakeProminent(pfdc, id_vgroup1); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(hr == S_OK, "got 0x%08x.\n", hr); IFileDialogCustomize_Release(pfdc); ref = IFileDialog_Release(pfod);

1 0

Vincent Povirk : comdlg32: Implement radio button lists in item dialog.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: 34d57e3621e08360b9d9306b15d55426cbad2cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=34d57e3621e08360b9d9306b1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 10 10:22:11 2015 -0500 comdlg32: Implement radio button lists in item dialog. --- dlls/comdlg32/itemdlg.c | 223 +++++++++++++++++++++++++++++++++++++++++- dlls/comdlg32/tests/itemdlg.c | 24 +++-- 2 files changed, 232 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34d57e3621e08360b9d93…

1 0

Bruno Jesus : quartz: Avoid audio header test code duplication.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: 66694cc043a86c4d2a3d96f390b22b4d18e60d39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66694cc043a86c4d2a3d96f39… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Sep 12 17:16:44 2015 +0800 quartz: Avoid audio header test code duplication. The function MPEGSplitter_head_check does exactly the same test. --- dlls/quartz/mpegsplit.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 1ed352b..273c77c 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -114,9 +114,7 @@ static HRESULT parse_header(BYTE *header, LONGLONG *plen, LONGLONG *pduration) int bitrate_index, freq_index, lsf = 1, mpeg1, layer, padding, bitrate, length; LONGLONG duration; - if (!(header[0] == 0xff && ((header[1]>>5)&0x7) == 0x7 && - ((header[1]>>1)&0x3) != 0 && ((header[2]>>4)&0xf) != 0xf && - ((header[2]>>2)&0x3) != 0x3)) + if (MPEGSplitter_head_check(header) != MPEG_AUDIO_HEADER) { FIXME("Not a valid header: %02x:%02x:%02x:%02x\n", header[0], header[1], header[2], header[3]); return E_INVALIDARG;

1 0

Gerald Pfeifer : netapi32: Avoid shift overflow for GENERIC_READ_ACCESS and friends. friends.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: a818d5cab2ebb7ff58b0aaf2ad39aa5374f40f22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a818d5cab2ebb7ff58b0aaf2a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Sep 11 21:31:12 2015 +0200 netapi32: Avoid shift overflow for GENERIC_READ_ACCESS and friends. friends. --- dlls/netapi32/netapi32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index d7af2e0..bb61e7f 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -506,10 +506,10 @@ static unsigned char ace_flags_to_samba( BYTE flags ) return ret; } -#define GENERIC_ALL_ACCESS (1 << 28) -#define GENERIC_EXECUTE_ACCESS (1 << 29) -#define GENERIC_WRITE_ACCESS (1 << 30) -#define GENERIC_READ_ACCESS (1 << 31) +#define GENERIC_ALL_ACCESS (1u << 28) +#define GENERIC_EXECUTE_ACCESS (1u << 29) +#define GENERIC_WRITE_ACCESS (1u << 30) +#define GENERIC_READ_ACCESS (1u << 31) static unsigned int access_mask_to_samba( DWORD mask ) {

1 0

Piotr Caban : msvcrt/tests: Fix tolower test failures.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: b408b5a9a47159a8d7a424e59fabd471f68b61ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=b408b5a9a47159a8d7a424e59… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Sep 12 13:15:27 2015 +0200 msvcrt/tests: Fix tolower test failures. --- dlls/msvcrt/tests/string.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index d247ba6..7733a7c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2608,6 +2608,7 @@ static void test_wctomb(void) static void test_tolower(void) { + WCHAR chw, lower; char ch, lch; int ret, len; @@ -2638,7 +2639,10 @@ static void test_tolower(void) ch = 0xF4; errno = 0xdeadbeef; ret = p_tolower(ch); - len = LCMapStringA(0, LCMAP_LOWERCASE, &ch, 1, &lch, 1); + if(!MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS, &ch, 1, &chw, 1) || + LCMapStringW(CP_ACP, LCMAP_LOWERCASE, &chw, 1, &lower, 1) != 1 || + (len = WideCharToMultiByte(CP_ACP, 0, &lower, 1, &lch, 1, NULL, NULL)) != 1) + len = 0; if(len) ok(ret==(unsigned char)lch || broken(ret==ch)/*WinXP-*/, "ret = %x\n", ret); else @@ -2649,7 +2653,10 @@ static void test_tolower(void) ch = 0xD0; errno = 0xdeadbeef; ret = p_tolower(ch); - len = LCMapStringA(0, LCMAP_LOWERCASE, &ch, 1, &lch, 1); + if(!MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS, &ch, 1, &chw, 1) || + LCMapStringW(CP_ACP, LCMAP_LOWERCASE, &chw, 1, &lower, 1) != 1 || + (len = WideCharToMultiByte(CP_ACP, 0, &lower, 1, &lch, 1, NULL, NULL)) != 1) + len = 0; if(len) ok(ret==(unsigned char)lch || broken(ret==ch)/*WinXP-*/, "ret = %x\n", ret); else

1 0