wine-devel July 2016

46 participants
227 discussions

Re: wine-devel Digest, Vol 132, Issue 55

by Anton Baskanov

On Wed, Jul 27, 2016 at 11:07 PM, <wine-devel-request(a)winehq.org> wrote: > ---------- Forwarded message ---------- > From: Nikolay Sivov <bunglehead(a)gmail.com> > To: wine-devel(a)winehq.org > Cc: > Date: Wed, 27 Jul 2016 17:39:26 +0300 > Subject: Re: [PATCH 1/6] amstream: Fix AMAudioData::QueryInterface. > On 27.07.2016 15:51, Anton Baskanov wrote: > > Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> > > --- > > dlls/amstream/audiodata.c | 1 - > > dlls/amstream/tests/Makefile.in | 3 +- > > dlls/amstream/tests/audiodata.c | 67 > +++++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 69 insertions(+), 2 deletions(-) > > create mode 100755 dlls/amstream/tests/audiodata.c > > Hi, Anton. > > Please keep tests in existing amstream.c file. > > + > > +static void test_query_interface(void) > > +{ > > + IUnknown *unknown = create_audio_data(); > > + IMemoryData *memory_data = NULL; > > + IAudioData *audio_data = NULL; > > + > > + HRESULT result = S_OK; > > result initialization is not needed; > > > + > > + result = IUnknown_QueryInterface(unknown, &IID_IMemoryData, (void > **)&memory_data); > > + ok(E_NOINTERFACE == result, "got 0x%08x\n", result); > > + if (S_OK == result) > > + { > > + IMemoryData_Release(memory_data); > > + } > > If it always fails, there's no reason add conditional Release. > > > + > > + result = IUnknown_QueryInterface(unknown, &IID_IAudioData, (void > **)&audio_data); > > + ok(S_OK == result, "got 0x%08x\n", result); > > + if (S_OK == result) > > + { > > + IAudioData_Release(audio_data); > > + } > > + > > + IUnknown_Release(unknown); > > +} > > Could you check if you can query IMemoryData from IAudioData? It seems > really weird if parent interface is not supported at all. > Hi, Nikolay. Thanks for the review! I've checked QueryInterface from IAudioData, and it also fails with IID_IMemoryData. I've fixed the issues and sent the updated patches.

7 years, 9 months

Re: [PATCH 2/2 v4] ucrtbase: Add _get_narrow_winmain_command_line tests

by Dmitry Timoshkov

Piotr Caban <piotr(a)codeweavers.com> wrote: > + sprintf(cmd, "\"\"%c\"\"\"%s\" \t \"misc\" cmd", name[0], name+1); > + memset(&startup, 0, sizeof(startup)); > + startup.cb = sizeof(startup); > + CreateProcessA(path, cmd, NULL, NULL, TRUE, > + CREATE_DEFAULT_ERROR_MODE|NORMAL_PRIORITY_CLASS, > + NULL, NULL, &startup, &proc); > + winetest_wait_child_process(proc.hProcess); Thanks for adding the tests. It shouldn't be too hard to also test other white space characters, at least testing '\r' and '\n' would be nice to have. -- Dmitry.

7 years, 9 months

Re: [PATCH 1/2] msvcp140: Add MSVC 2015 C++ support DLL

by Piotr Caban

On 07/27/16 21:49, Daniel Lehman wrote: > +@ stub ??$_Getvals@_W@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IAAX_WABV_Locinfo@1@@Z > +@ stub ??$_Getvals@_W@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IAEX_WABV_Locinfo@1@@Z > +@ stub ??$_Getvals@_W@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@IEAAX_WAEBV_Locinfo@1@@Z > +@ stub ??$_Getvals@_W@?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@IAAX_WABV_Locinfo@1@@Z > +@ stub ??$_Getvals@_W@?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@IAEX_WABV_Locinfo@1@@Z > +@ stub ??$_Getvals@_W@?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@IEAAX_WAEBV_Locinfo@1@@Z > +@ stub ??$_Getvals@_W@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@IAAX_WABV_Locinfo@1@@Z > +@ stub ??$_Getvals@_W@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@IAEX_WABV_Locinfo@1@@Z > +@ stub ??$_Getvals@_W@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@IEAAX_WAEBV_Locinfo@1@@Z Could you please add -arch specifiers to stub entries? Thanks, Piotr

7 years, 9 months

Re: avifil32: Use debugstr_a() and debugstr_w() in TRACE() messages.

by Nikolay Sivov

I see it's Rejected on the patch list, it's indeed wrong, because you're tracing output parameters.

7 years, 9 months

Re: [PATCH 2/6] d3d9/tests: Add visual tests for locking vertexbuffers

by Henri Verbeet

On 26 July 2016 at 19:09, Patrick Rudolph <siro(a)das-labor.org> wrote: > + static const struct > + { > + const char *flags_s; > + unsigned int flags; > + DWORD usage; > + BOOL unsyncronized; > + BOOL todo; > + BOOL broken; > + } > + /* Nvidia ignores D3DLOCK_NOOVERWRITE on non dynamic buffers, > + * while AMD always accepts D3DLOCK_NOOVERWRITE on all buffers. */ > + tests[] = > + { > + {"0", 0, 0, FALSE, FALSE, FALSE}, > + {"0", 0, D3DUSAGE_DYNAMIC, FALSE, FALSE, FALSE}, > + {"D3DLOCK_NOOVERWRITE", D3DLOCK_NOOVERWRITE, 0, FALSE, FALSE, TRUE}, > + {"D3DLOCK_NOOVERWRITE", D3DLOCK_NOOVERWRITE, D3DUSAGE_DYNAMIC, TRUE, FALSE, FALSE}, > + {"D3DLOCK_DISCARD", D3DLOCK_DISCARD, 0, FALSE, FALSE, FALSE}, > + {"D3DLOCK_DISCARD", D3DLOCK_DISCARD, D3DUSAGE_DYNAMIC, FALSE, FALSE, FALSE}, > + {"D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD", > + D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD, 0, FALSE, FALSE, TRUE}, > + {"D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD", > + D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD, D3DUSAGE_DYNAMIC, TRUE, TRUE, TRUE}, > + {"D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY", > + D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY, 0, FALSE, FALSE, TRUE}, > + {"D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY", > + D3DLOCK_NOOVERWRITE | D3DLOCK_READONLY, D3DUSAGE_DYNAMIC, TRUE, TRUE, TRUE}, > + }; [...] > + todo_wine_if (tests[i].todo) > + { > + ok(tests[i].unsyncronized == unsyncronized || broken(tests[i].broken), > + "Expected buffer mapped %s. Flags = %s. Usage = %#x.\n", > + tests[i].unsyncronized ? "unsyncronized" : "syncronized", tests[i].flags_s, tests[i].usage); > + } I assume the broken() is for the testbot, but the way this is written, half the cases aren't really tested on Windows. Also, what makes these fail on the testbot? > + timestamp1 = GetTickCount(); > + > + hr = IDirect3DDevice9_BeginScene(device); > + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); > + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, tri); > + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); > + hr = IDirect3DDevice9_EndScene(device); > + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); > + > + /* dummy read to wait for GPU being done */ > + color = getPixelColor(device, 160, 360); > + > + timestamp2 = GetTickCount(); > + > + /* Adjust buffer size for 1 second draw call duration */ > + size = (size * 1000UL) / (timestamp2 - timestamp1 + 1); Does this work reliably? GetTickCount() has very limited resolution, I think there's a real chance that the draw will take only a fraction of GetTickCount()'s resolution.

7 years, 9 months

Re: [PATCH 1/6] wined3d/resource: Add flag WINED3D_MAP_WRITEONLY

by Henri Verbeet

On 26 July 2016 at 19:09, Patrick Rudolph <siro(a)das-labor.org> wrote: > #define WINED3D_MAP_READONLY 0x0010 > +#define WINED3D_MAP_WRITEONLY 0x0020 But now the API is weird. What happens when both READONLY and WRITEONLY are set? I think the d3d11 model makes more sense.

7 years, 9 months

Re: [PATCH 3/4] mpr: Implement WNetCancelConnection2W().

by Nikolay Sivov

On 27.07.2016 16:16, Pierre Schweitzer wrote: > > DWORD WINAPI WNetCancelConnection2W( LPCWSTR lpName, DWORD dwFlags, BOOL fForce ) > { > - FIXME( "(%s, %08X, %d), stub\n", debugstr_w(lpName), dwFlags, fForce ); I think it's better to keep this as TRACE, also maybe change lpName -> name, dwFlags -> flags, fForce -> force. Flags are unused, so maybe some fixme message for them is appropriate. > + DWORD ret = WN_NO_NETWORK; > + DWORD index; > > - return WN_SUCCESS; > + if (providerTable != NULL) > + { > + for (index = 0; index < providerTable->numProviders; index++) > + { > + if(providerTable->table[index].getCaps(WNNC_CONNECTION) & > + WNNC_CON_GETCONNECTIONS) Shouldn't this be WNNC_CON_CANCELCONNECTION? > + { > + if (providerTable->table[index].cancelConnection) > + ret = providerTable->table[index].cancelConnection((LPWSTR)lpName, fForce); > + else > + ret = WN_NO_NETWORK; > + if (ret == WN_SUCCESS || ret == WN_OPEN_FILES) > + break; > + } According to docs, WN_OPEN_FILES happens when force == FALSE, does it make sense to handle it only in this case? Of course we have no easy way to test any of that. > + } > + } > + return ret; > }

7 years, 9 months

Re: [PATCH 2/2] msvcp140: add sprintf

by Nikolay Sivov

> +#if _MSVCP_VER >= 140 > +int __cdecl sprintf(char *buf, const char *fmt, ...) > +{ > + int ret; > + __ms_va_list valist; > + __ms_va_start(valist, fmt); > + ret = __stdio_common_vsprintf(2, buf, -1, fmt, NULL, valist); > + __ms_va_end(valist); > + return ret; > +} > +#endif Are we missing patch 1/2 that adds msvcp140? Also won't it work the same if you forward it to MSVCRT_sprintf? If _common_ functions should actually be used, options should use existing private defines.

7 years, 9 months

Re: [PATCH 3/3] ntdll: For Mac 64-bit, poke NtCurrentTeb()->ThreadLocalStoragePointer to the corresponding offset from %gs.

by Sebastian Lackner

On 27.07.2016 17:42, Ken Thomases wrote: > 64-bit Windows apps have hard-coded accesses to %gs:0x58 baked into them. They > need to find the ThreadLocalStoragePointer there. > > Technically, the gsbase register and the memory it points to belong to the > pthread implementation on macOS. It's used for the pthread TLS implementation. > Slot 11 (offset 0x58) is currently used for the implementation of the ttyname() > system library function. We do not anticipate that Wine or any of the system > libraries or frameworks it uses will call ttyname(). Furthermore, Apple has > made it so that future releases of macOS will no longer use that slot. So, we > hijack it for our purposes. > > Signed-off-by: Ken Thomases <ken(a)codeweavers.com> > --- > dlls/ntdll/loader.c | 11 +++++++- > dlls/ntdll/signal_x86_64.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 72 insertions(+), 1 deletion(-) I'm not sure if I correctly understand the purpose of this patch. If you have to set %gs:0x58 to some specific value, why not just use an assembly instruction for that?

7 years, 9 months

Re: [PATCH 2/6] d3drm: Implement IDirect3DRM*::CreateViewport. (v2 resend)

by Stefan Dösinger

On 2016-07-19 19:08, Aaryaman Vasishta wrote: > + if (FAILED(hr = IDirect3DRMDevice_QueryInterface(device, &IID_IDirect3DRMDevice3, (void **)&device3))) > + return hr; > + > + if (FAILED(hr = IDirect3DRMFrame_QueryInterface(camera, &IID_IDirect3DRMFrame3, (void **)&camera3))) > + { > + IDirect3DRMDevice3_Release(device3); > + return hr; > + } > + IDirect3DRMDevice_Release(device); > + IDirect3DRMFrame_Release(camera); This releases references you don't own. Same in the V2 -> V3 thunk. > + if (!device || !camera) > + return D3DRMERR_BADOBJECT; > + if (!viewport) > + return D3DRMERR_BADVALUE; These checks are redundant, Init() does that as well. > + ok(ref4 == frame_ref, "Expected ref4 == frame_ref, got frame_ref = %u, ref4 = %u.\n", frame_ref, ref4); > + > + device_ref = get_refcount((IUnknown *)device1); > + frame_ref = get_refcount((IUnknown *)frame); The get_refcount here seems redundant because you've just shown that it is back to where it used to be.

7 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel July 2016