July 2017 - Wine-devel - list.winehq.org

Re: [PATCH 4/5] msi: Don't increment the refcount when creating dialogs.
by Hans Leidekker 06 Jul '17

06 Jul '17

On Wed, 2017-07-05 at 23:31 -0500, Zebediah Figura wrote: > We should only ever have one dialog anyway, and this is destroyed > when we close the package. It causes a crash in a random installer here: $ ./wine msiexec /i "XPSEP XP and Server 2003 32 bit.msi" fixme:ntdll:NtLockFile I/O completion on lock not implemented yet err:msi:msiobj_addref Invalid handle! err:msi:msiobj_addref Invalid handle! wine: Unhandled page fault on read access to 0x57e5896d at address 0x7ed68688 (thread 0009), starting debugger... Unhandled exception: page fault on read access to 0x57e5896d in 32-bit code (0x7ed68688). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:7ed68688 ESP:0032d078 EBP:0032d088 EFLAGS:00210202( R- -- I - - - ) EAX:57e5896d EBX:7edaf2f4 ECX:00151018 EDX:7ed686d0 ESI:57e58949 EDI:00000045 Stack dump: 0x0032d078: 00150c40 7edaee74 00150c40 00150c40 0x0032d088: 0032d0e8 7ed6b4ae 7ed84b14 00000016 0x0032d098: 0032d0c8 7edaee40 4d430003 00000000 0x0032d0a8: 00000000 00000000 00000000 00000000 0x0032d0b8: 4d430000 0014947c 0000001c 7bc4fc76 0x0032d0c8: 0032d0f0 7edaf2f4 7edaee40 00150c40 Backtrace: =>0 0x7ed68688 find_cached_table+0x28(db=<is not available>, name="EventMapping") [/home/hans/wine/dlls/msi/../../include/wine/unicode.h:216] in msi (0x0032d088) 1 0x7ed6b4ae get_table+0x1d() in msi (0x0032d0e8) 2 0x7ed6c9e8 TABLE_CreateView+0xe7(db=0x7edaee40, name="EventMapping", view=0x14946c) [/home/hans/wine/dlls/msi/table.c:2179] in msi (0x0032d128) 3 0x7ed72857 WHERE_CreateView+0xe6(db=0x7edaee40, view=0x32d1e4, tables="EventMapping", cond=0x149400) [/home/hans/wine/dlls/msi/where.c:1242] in msi (0x0032d178) fixme:dbghelp_dwarf:compute_location Only supporting one reg (ebp/22 -> -2) 4 0x7ed75cd2 sql_parse+0xd71(info=0x32d9f4) [/home/hans/wine/dlls/msi/sql.y:506] in msi (0x0032d9d8) 5 0x7ed763af MSI_ParseSQL+0x4e(db=0x7edaee40, command="SELECT * FROM `EventMapping` WHERE `Dialog_` = 'ProgressForm' AND `Control_` = 'NextButton'", phview=0x154370, mem=0x15437c) [/home/hans/wine/dlls/msi/sql.y:1002] in msi (0x0032da18) 6 0x7ed49012 MSI_DatabaseOpenViewW+0x71() in msi (0x0032da58) 7 0x7ed4911f MSI_OpenQuery+0x8e(db=0x7edaee40, view=0x32dac4, fmt="SELECT * FROM `EventMapping` WHERE `Dialog_` = '%s' AND `Control_` = '%s'") [/home/hans/wine/dlls/msi/msiquery.c:163] in msi (0x0032da98) 8 0x7ed21ce2 dialog_map_events+0x31(dialog=<is not available>, control=<is not available>) [/home/hans/wine/dlls/msi/dialog.c:761] in msi (0x0032dad8) 9 0x7ed26a9e msi_dialog_add_control+0xad(dialog=0x15e0b8, rec=0x154218, szCls="BUTTON", style=0x18010000) [/home/hans/wine/dlls/msi/dialog.c:791] in msi (0x0032db18) 10 0x7ed28dfa msi_dialog_button_control+0xf9(dialog=0x15e0b8, rec=0x154218) [/home/hans/wine/dlls/msi/dialog.c:1011] in msi (0x0032db58) 11 0x7ed22070 msi_dialog_create_controls+0xaf(rec=0x154218, param=0x15e0b8) [/home/hans/wine/dlls/msi/dialog.c:3475] in msi (0x0032db88) 12 0x7ed49a2a MSI_IterateRecords+0x79(view=0x1f0e48, count=0x0(nil), func=0x7ed21fc0, param=0x15e0b8) [/home/hans/wine/dlls/msi/msiquery.c:188] in msi (0x0032dbd8) 13 0x7ed264f2 MSIDialog_WndProc+0xb71(hwnd=<couldn't compute location>, msg=<couldn't compute location>, wParam=<couldn't compute location>, lParam=<couldn't compute location>) [/home/hans/wine/dlls/msi/dialog.c:3502] in msi (0x0032dcd8) 14 0x7e9ee37a WINPROC_wrapper+0x19() in user32 (0x0032dd18) 15 0x7e9ee9ba call_window_proc+0x49(hwnd=0x2005a, msg=0x1, wp=0, lp=0x32e050, result=0x32dde8, arg=0x7ed25980) [/home/hans/wine/dlls/user32/winproc.c:245] in user32 (0x0032dd68) 16 0x7e9f0ce5 WINPROC_call_window+0xc4(hwnd=0x2005a, msg=0x1, wParam=0, lParam=0x32e050, result=0x32dde8, unicode=0x1, mapping=2124605252) [/home/hans/wine/dlls/user32/winproc.c:920] in user32 (0x0032ddb8) 17 0x7e9b4b14 call_window_proc+0x63(hwnd=0x2005a, msg=0x1, wparam=0, lparam=0x32e050, unicode=0x1, same_thread=0x1, mapping=2124605252) [/home/hans/wine/dlls/user32/message.c:2224] in user32 (0x0032de18) 18 0x7e9bbb0e send_message+0x1bd(info=0x32dea4, res_ptr=0x32dea0, unicode=0x1) [/home/hans/wine/dlls/user32/message.c:3269] in user32 (0x0032de88) 19 0x7e9bbd61 SendMessageW+0x50(hwnd=<couldn't compute location>, msg=<couldn't compute location>, wparam=<couldn't compute location>, lparam=<couldn't compute location>) [/home/hans/wine/dlls/user32/message.c:3469] in user32 (0x0032ded8) 20 0x7e9e54aa WIN_CreateWindowEx+0xba9(cs=0x32e050, className="MsiDialogCloseClass", module=(nil), unicode=0x1) [/home/hans/wine/dlls/user32/win.c:1641] in user32 (0x0032e038) 21 0x7e9df098 CreateWindowExW+0x72(exStyle=<couldn't compute location>, className=<couldn't compute location>, windowName=<couldn't compute location>, style=<couldn't compute location>, x=<couldn't compute location>, y=<couldn't compute location>, width=<couldn't compute location>, height=<couldn't compute location>, parent=<couldn't compute location>, menu=<couldn't compute location>, instance=<couldn't compute location>, data=<couldn't compute location>) [/home/hans/wine/dlls/user32/win.c:1776] in user32 (0x0032e088) 22 0x7ed231c6 dialog_run_message_loop+0x65() in msi (0x0032e0f8) 23 0x7ed2ad43 event_do_dialog+0x42(package=0x13f538, name=<is not available>, parent=(nil), destroy_modeless=0x1) [/home/hans/wine/dlls/msi/dialog.c:4349] in msi (0x0032e128) 24 0x7ed2c0e9 ACTION_DialogBox+0x48(package=0x13f538, dialog="ProgressForm") [/home/hans/wine/dlls/msi/dialog.c:4567] in msi (0x0032e168) 25 0x7ed4c8ca MSI_ProcessMessage+0x5d9(package=0x13f538, eMessageType=INSTALLMESSAGE_SHOWDIALOG, record=0x146d60) [/home/hans/wine/dlls/msi/package.c:1794] in msi (0x0032f288) 26 0x7ed2bfc7 ACTION_ShowDialog+0x76(package=0x13f538, dialog="ProgressForm") [/home/hans/wine/dlls/msi/dialog.c:4522] in msi (0x0032fac8) 27 0x7ecfad88 ACTION_HandleCustomAction.part+0x77() in msi (0x0032faf8) 28 0x7ed0ab3c ACTION_PerformUIAction+0xab() in msi (0x0032fb38) 29 0x7ed0acdc ITERATE_Actions+0x13b(row=0x152b60, param=0x13f538) [/home/hans/wine/dlls/msi/action.c:499] in msi (0x0032fb78) 30 0x7ed49a2a MSI_IterateRecords+0x79(view=0x146928, count=0x0(nil), func=0x7ed0aba0, param=0x13f538) [/home/hans/wine/dlls/msi/msiquery.c:188] in msi (0x0032fbc8) 31 0x7ed0b463 MSI_InstallPackage+0x4f2(package=0x13f538, szPackagePath="XPSEP XP and Server 2003 32 bit.msi", szCommandLine=0x0(nil)) [/home/hans/wine/dlls/msi/action.c:604] in msi (0x0032fc18) 32 0x7ed3dd51 MsiInstallProductW+0xc0(szPackagePath=<is not available>, szCommandLine=<is not available>) [/home/hans/wine/dlls/msi/msi.c:251] in msi (0x0032fc68) 33 0x7efefbee WinMain+0x73d(hInstance=<is not available>, hPrevInstance=<is not available>, lpCmdLine=<is not available>, nCmdShow=<is not available>) [/home/hans/wine/programs/msiexec/msiexec.c:994] in msiexec (0x0032fd48) 34 0x7efee904 main+0xc3(argc=<couldn't compute location>, argv=<couldn't compute location>) [/home/hans/wine/dlls/winecrt0/exe_main.c:49] in msiexec (0x0032fde8) 35 0x7eff12ff __wine_spec_exe_entry+0x6e(peb=<couldn't compute location>) [/home/hans/wine/dlls/winecrt0/exe_entry.c:36] in msiexec (0x0032fe38) 36 0x7b45ee6c call_process_entry+0xb() in kernel32 (0x0032fe58) 37 0x7b45fe09 start_process+0x68(entry=<couldn't compute location>) [/home/hans/wine/dlls/kernel32/process.c:1116] in kernel32 (0x0032fe98) 38 0x7bc7e5b0 call_thread_func_wrapper+0xb() in ntdll (0x0032feb8) 39 0x7bc813a1 call_thread_func+0xb0(entry=0x7b45fda0, arg=0x7eff1290, frame=0x32ffc8) [/home/hans/wine/dlls/ntdll/signal_i386.c:2759] in ntdll (0x0032ffa8) 40 0x7bc7e58e call_thread_entry_point+0x11() in ntdll (0x0032ffc8) 41 0x7bc53473 start_process+0x12(arg=0xffaf6bd8) [/home/hans/wine/dlls/ntdll/loader.c:3083] in ntdll (0x0032ffe8) 42 0xf757d81d wine_call_on_stack+0x1c() in libwine.so.1 (0x00000000) 43 0xf757d980 wine_switch_to_stack+0x1f(func=0x7bc53460, arg=0xffaf6bd8, stack=0x330000) [/home/hans/wine/libs/wine/port.c:77] in libwine.so.1 (0xffaf6ba8) 44 0x7bc5911a LdrInitializeThunk+0x239(kernel_start=<couldn't compute location>, unknown2=<couldn't compute location>, unknown3=<couldn't compute location>, unknown4=<couldn't compute location>) [/home/hans/wine/dlls/ntdll/loader.c:3144] in ntdll (0xffaf6bf8) 45 0x7b465c33 __wine_kernel_init+0x962() [/home/hans/wine/dlls/kernel32/process.c:1310] in kernel32 (0xffaf7ae8) 46 0x7bc59ee3 __wine_process_init+0x152() [/home/hans/wine/dlls/ntdll/loader.c:3353] in ntdll (0xffaf7b58) 47 0xf757bbe3 wine_init+0x292(argc=0x4, argv=0xffaf8094, error="", error_size=0x400) [/home/hans/wine/libs/wine/loader.c:974] in libwine.so.1 (0xffaf7ba8) 48 0x7c000aaa main+0x79(argc=<is not available>, argv=<is not available>) [/home/hans/wine/loader/main.c:258] in <wine-loader> (0xffaf7fe8) 49 0xf739ea63 __libc_start_main+0xf2() in libc.so.6 (0x00000000) 0x7ed68688 find_cached_table+0x28 [/home/hans/wine/dlls/msi/../../include/wine/unicode.h:216] in msi: cmpw 0x24(%esi),%di 216 while (*str1 && (*str1 == *str2)) { str1++; str2++; }

1 0

Re: [PATCH 2/5] msi: Add a basic internal UI implementation.
by Marvin 06 Jul '17

06 Jul '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=32104 Your paranoid android. === w7u (32 bit msi) === The task timed out

1 0

Re: [2/2] vcomp/tests: Test more arguments with a callback
by Sebastian Lackner 05 Jul '17

05 Jul '17

On 05.07.2017 21:23, André Hentschel wrote: > - p_vcomp_fork(TRUE, 5, fork_uintptr_cb, (UINT_PTR)1, (UINT_PTR)(MAXUINT_PTR - 2), > - (UINT_PTR)3, (UINT_PTR)(MAXUINT_PTR - 4), (UINT_PTR)5); > + p_vcomp_fork(TRUE, 12, fork_uintptr_cb, (UINT_PTR)1, (UINT_PTR)(MAXUINT_PTR - 2), > + (UINT_PTR)3, (UINT_PTR)(MAXUINT_PTR - 4), (UINT_PTR)5, > + (UINT_PTR)6, (UINT_PTR)7, (UINT_PTR)8, (UINT_PTR)9, > + (UINT_PTR)10, (UINT_PTR)11); Shouldn't the second argument be 11?

2 1

Re: [PATCH 3/3] d3dx9/tests: Add tests for array of samplers.
by Matteo Bruni 05 Jul '17

05 Jul '17

2017-06-28 13:28 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: Sorry for the delayed reviews. I did it at last... > #define test_effect_preshader_compare_shader_bytecode(a, b, c, d) \ > @@ -4505,12 +4551,38 @@ static void test_effect_preshader(IDirect3DDevice9 *device) > hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_MAGFILTER, &value); > ok(hr == D3D_OK, "Got result %#x.\n", hr); > todo_wine ok(value == 3, "Unexpected sampler 0 magfilter %u.\n", value); > + > + hr = IDirect3DDevice9_GetSamplerState(device, 1, D3DSAMP_MINFILTER, &value); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + ok(value == 1, "Unexpected sampler 1 minfilter %u.\n", value); > + hr = IDirect3DDevice9_GetSamplerState(device, 1, D3DSAMP_MAGFILTER, &value); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + todo_wine > + ok(value == 1, "Unexpected sampler 1 magfilter %u.\n", value); Not new or really related to this patch: any idea about what's going on with the magfilter state computation? I didn't really look into it, does it have to do with default parameter values by any chance?

2 7

Re: [PATCH] dmime: Rename IPersistStreamImpl_Load functions
by Michael Stefaniuc 05 Jul '17

05 Jul '17

Hello Alistair, On 07/05/2017 08:17 AM, Alistair Leslie-Hughes wrote: > When a log had IPersistStreamImpl_Load entry from dmime, it's > quiet confusing to which of the _Load function was used. could you please change the "persist_stream" part of the new name to "IPersistStream"? That way it is consistent with the other method names. thanks bye michael > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/dmime/lyricstrack.c | 4 ++-- > dlls/dmime/markertrack.c | 4 ++-- > dlls/dmime/paramcontroltrack.c | 4 ++-- > dlls/dmime/segment.c | 4 ++-- > dlls/dmime/segtriggertrack.c | 4 ++-- > dlls/dmime/seqtrack.c | 4 ++-- > dlls/dmime/sysextrack.c | 4 ++-- > dlls/dmime/tempotrack.c | 4 ++-- > dlls/dmime/timesigtrack.c | 4 ++-- > dlls/dmime/wavetrack.c | 4 ++-- > 10 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c > index 70382735d5..66293526dc 100644 > --- a/dlls/dmime/lyricstrack.c > +++ b/dlls/dmime/lyricstrack.c > @@ -240,7 +240,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { > IDirectMusicTrack8Impl_Join > }; > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) > +static HRESULT WINAPI lyrics_persist_stream_Load(IPersistStream *iface, IStream *stream) > { > FIXME(": Loading not implemented yet\n"); > return S_OK; > @@ -252,7 +252,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + lyrics_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c > index 852948ab40..0fe72f9c91 100644 > --- a/dlls/dmime/markertrack.c > +++ b/dlls/dmime/markertrack.c > @@ -188,7 +188,7 @@ static const IDirectMusicTrackVtbl dmtrack_vtbl = { > IDirectMusicTrackImpl_Clone > }; > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) > +static HRESULT WINAPI marker_persist_stream_Load(IPersistStream *iface, IStream *stream) > { > FIXME(": Loading not implemented yet\n"); > return S_OK; > @@ -200,7 +200,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + marker_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/paramcontroltrack.c b/dlls/dmime/paramcontroltrack.c > index affea1da90..a7bc873c97 100644 > --- a/dlls/dmime/paramcontroltrack.c > +++ b/dlls/dmime/paramcontroltrack.c > @@ -240,7 +240,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { > IDirectMusicTrack8Impl_Join > }; > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) > +static HRESULT WINAPI param_persist_stream_Load(IPersistStream *iface, IStream *stream) > { > FIXME(": Loading not implemented yet\n"); > return S_OK; > @@ -252,7 +252,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + param_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c > index ad8561fcae..be4a850556 100644 > --- a/dlls/dmime/segment.c > +++ b/dlls/dmime/segment.c > @@ -1171,7 +1171,7 @@ static inline IDirectMusicSegment8Impl *impl_from_IPersistStream(IPersistStream > return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, dmobj.IPersistStream_iface); > } > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) > +static HRESULT WINAPI seg_persist_stream_Load(IPersistStream *iface, IStream *pStm) > { > IDirectMusicSegment8Impl *This = impl_from_IPersistStream(iface); > HRESULT hr; > @@ -1248,7 +1248,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + seg_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c > index d1b208a6d0..17d5da2db5 100644 > --- a/dlls/dmime/segtriggertrack.c > +++ b/dlls/dmime/segtriggertrack.c > @@ -456,7 +456,7 @@ static inline IDirectMusicSegTriggerTrack *impl_from_IPersistStream(IPersistStre > return CONTAINING_RECORD(iface, IDirectMusicSegTriggerTrack, dmobj.IPersistStream_iface); > } > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) > +static HRESULT WINAPI trigger_persist_stream_Load(IPersistStream *iface, IStream *pStm) > { > IDirectMusicSegTriggerTrack *This = impl_from_IPersistStream(iface); > DMUS_PRIVATE_CHUNK Chunk; > @@ -505,7 +505,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + trigger_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c > index 2d80db75cd..7e74fa6036 100644 > --- a/dlls/dmime/seqtrack.c > +++ b/dlls/dmime/seqtrack.c > @@ -242,7 +242,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { > IDirectMusicTrack8Impl_Join > }; > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) > +static HRESULT WINAPI track_persist_stream_Load(IPersistStream *iface, IStream *stream) > { > FIXME(": Loading not implemented yet\n"); > return S_OK; > @@ -254,7 +254,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + track_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c > index 431fca7227..ba7a8fdc7c 100644 > --- a/dlls/dmime/sysextrack.c > +++ b/dlls/dmime/sysextrack.c > @@ -242,7 +242,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { > IDirectMusicTrack8Impl_Join > }; > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) > +static HRESULT WINAPI sys_persist_stream_Load(IPersistStream *iface, IStream *stream) > { > FIXME(": Loading not implemented yet\n"); > return S_OK; > @@ -254,7 +254,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + sys_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c > index 70de44228f..3c6f957571 100644 > --- a/dlls/dmime/tempotrack.c > +++ b/dlls/dmime/tempotrack.c > @@ -320,7 +320,7 @@ static inline IDirectMusicTempoTrack *impl_from_IPersistStream(IPersistStream *i > return CONTAINING_RECORD(iface, IDirectMusicTempoTrack, dmobj.IPersistStream_iface); > } > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) > +static HRESULT WINAPI tempo_persist_stream_Load(IPersistStream *iface, IStream *pStm) > { > IDirectMusicTempoTrack *This = impl_from_IPersistStream(iface); > DMUS_PRIVATE_CHUNK Chunk; > @@ -375,7 +375,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + tempo_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c > index 9bd7450264..72fdac8cbe 100644 > --- a/dlls/dmime/timesigtrack.c > +++ b/dlls/dmime/timesigtrack.c > @@ -189,7 +189,7 @@ static const IDirectMusicTrackVtbl dmtack_vtbl = { > IDirectMusicTrackImpl_Clone > }; > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) > +static HRESULT WINAPI time_persist_stream_Load(IPersistStream *iface, IStream *stream) > { > FIXME(": Loading not implemented yet\n"); > return S_OK; > @@ -201,7 +201,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + time_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; > diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c > index bc6e3ca413..20656a9362 100644 > --- a/dlls/dmime/wavetrack.c > +++ b/dlls/dmime/wavetrack.c > @@ -249,7 +249,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { > IDirectMusicTrack8Impl_Join > }; > > -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) > +static HRESULT WINAPI wave_persist_stream_Load(IPersistStream *iface, IStream *stream) > { > FIXME(": Loading not implemented yet\n"); > return S_OK; > @@ -261,7 +261,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { > dmobj_IPersistStream_Release, > dmobj_IPersistStream_GetClassID, > unimpl_IPersistStream_IsDirty, > - IPersistStreamImpl_Load, > + wave_persist_stream_Load, > unimpl_IPersistStream_Save, > unimpl_IPersistStream_GetSizeMax > }; >

1 0

Re: [PATCH] mmdevapi/tests: Use standard wine_dbgstr_longlong.
by Marvin 05 Jul '17

05 Jul '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=32062 Your paranoid android. === w7u (32 bit render) === render.c:1029: Test failed: Position 6592 too far after playing 100ms === w864 (32 bit render) === render.c:1255: Test failed: GetBuffer large (20671) at iteration 2

1 0

Re: [PATCH 2/5] msi: Add a basic internal UI implementation.
by Marvin 04 Jul '17

04 Jul '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=32025 Your paranoid android. === w7u (32 bit msi) === The task timed out

3 3

Re: [1/5] libwine: Added a wine_mmap_is_in_reserved_area_ex function which returns boundary address.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > include/wine/library.h | 1 + > libs/wine/mmap.c | 23 ++++++++++++++++++++++- > libs/wine/wine.map | 1 + > 3 files changed, 24 insertions(+), 1 deletion(-) > > diff --git a/include/wine/library.h b/include/wine/library.h > index 242bb69..0920c60 100644 > --- a/include/wine/library.h > +++ b/include/wine/library.h > @@ -79,6 +79,7 @@ extern void *wine_anon_mmap( void *start, size_t size, int prot, int flags ); > extern void wine_mmap_add_reserved_area( void *addr, size_t size ); > extern void wine_mmap_remove_reserved_area( void *addr, size_t size, int unmap ); > extern int wine_mmap_is_in_reserved_area( void *addr, size_t size ); > +extern int wine_mmap_is_in_reserved_area_ex( void *addr, size_t size, void **boundary ); > extern int wine_mmap_enum_reserved_areas( int (*enum_func)(void *base, size_t size, void *arg), > void *arg, int top_down ); > I'm afraid we don't want to add functions either. It should be possible to implement what you want without changing the libwine interface. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Definition (or not) of IDXGIResource methods
by Ben "Root" Anderson 04 Jul '17

04 Jul '17

On Mon, Jul 3, 2017 at 1:52 PM, Henri Verbeet <hverbeet(a)gmail.com> wrote: > I expect ultimately you'll need some way to get at the underlying > OpenGL object. One way to go about that may to for example extend the > IWineDXGIDevice interface in include/wine/winedxgi.idl with a method > to retrieve the underlying OpenGL object of a resource. Thanks for the tip. It'll likely make a good temporary hack until I put together the (sizable) proper solution. The added functions may even wind up being a part of said solution. > There are some details to take care of there though. For one, while > wined3d is implemented on top OpenGL, that's an implementation detail > and may not be true forever. A D3D surface/texture could be backed by > an OpenGL texture, an OpenGL renderbuffer, both, or something else > entirely, so you'll probably want some kind of interface to negotiate > the kind of representation you're requesting. Even if for simplicity > we assume we have a D3D texture backed by an OpenGL texture, that > doesn't guarantee that at any given time that OpenGL texture is > current/coherent. (See also, wined3d_texture_load_location(), > wined3d_texture_validate_location(), > wined3d_texture_invalidate_location(), etc.) So you may need a way to > flush/synchronise that OpenGL texture as well. And while > IWineDXGIDevice may be a good way to prove the concept, that's an > internal interface that doesn't make any guarantees about interface > stability, so for something that you'd want to use to interface with > external software, it would be best to create a separate interface > that does make those kinds of guarantees. Yeah, I definitely want to avoid interfaces that aren't agnostic to the underlying implementation, at which point it makes more sense to instead implement the relevant Windows APIs. My current plan is to make and submit a patch to wine-staging that implements VK_KHX_external_memory_win32 and the Direct3D/DXGI functionality needed to interact with that extension from Direct3D; this implementation would very probably lean on GL_EXT_memory_object and related extensions. Then, I'd use those interfaces to import the textures into a Vulkan instance, which is then passed to the compositor. > Finally, does this need to work with arbitrary resources, or do you > only need this for e.g. swapchain buffers? It needs to work not with swapchain buffers, but a pair of ID3D11Texture2D objects that are created by the application for the express purpose of being passed to the API I'm wrapping. One or both of these textures may or may not also be presented by the application in its own window through the usual D3D process, but I do not know and am not supposed to know whether they are, and shouldn't care. (Some apps actually render and present a completely separate scene in their window.) I need to ultimately pass the textures to the native Linux version of the compositor in a form it can digest (specifically, either a GL texture or render buffer name, or a VkImage and associated instance structs), which then (among other things) presents it in the HMD using its own (Vulkan) swapchains.

2 1

Re: [PATCH 3/4] d3drm: Initial support for storing animation keys
by Henri Verbeet 04 Jul '17

04 Jul '17

On 4 July 2017 at 09:43, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > +static int d3drm_animation_cmp_min(const struct d3drm_animation_keys *keys, D3DVALUE left, D3DVALUE right, DWORD *cur) > +{ > + if (left == right) > + { > + while (*cur > 0 && left == keys->keys[*cur - 1].time) > + (*cur)--; > + return 0; > + } Does this really need to happen inside the comparison function? I.e., couldn't you just use a single comparison function, bsearch(), and do the fixup for duplicates afterwards? > +static DWORD d3drm_animation_get_index(struct d3drm_animation_keys *keys, D3DVALUE time, > + int (*compare_func)(const struct d3drm_animation_keys *keys, D3DVALUE left, D3DVALUE right, DWORD *cur)) > +{ > + int min = 0, max = keys->count - 1; unsigned/SIZE_T, right? > +static BOOL d3drm_animation_get_range(struct d3drm_animation_keys *keys, D3DVALUE time_min, D3DVALUE time_max, > + DWORD *min, DWORD *max) > +{ > + if (keys->count == 0) > + return FALSE; > + > + if (time_min > keys->keys[keys->count - 1].time || time_max < keys->keys[0].time) > + return FALSE; > + > + *min = d3drm_animation_get_index(keys, time_min, d3drm_animation_cmp_min); > + *max = d3drm_animation_get_index(keys, time_max, d3drm_animation_cmp_max); This is pretty minor, but note that to find *max you'd only have to search through *min to the end, instead of through the entire range. > + if (!key || key->dwSize != sizeof(*key)) > + return E_INVALIDARG; We usually print a WARN for cases where the application passes us questionable data. That's certainly not a strict requirement, but on occasion it does tend to make it slightly easier to figure out where things start failing. > + memmove(keys->keys + index + 1, keys->keys + index, sizeof(*keys->keys) * (keys->count - index)); We'd typically write those as "&keys->keys[index + 1]", etc. That's purely stylistic, of course. > + if (d3drm_animation_get_range(&animation->rotate, time_min, time_max, &min, &max)) > + { > + *count += max - min + 1; > + > + for (i = min; i <= max && keys; i++, cur++) > + { > + keys[cur].dwSize = sizeof(*keys); > + keys[cur].dwKeyType = D3DRMANIMATION_ROTATEKEY; > + keys[cur].dvTime = animation->rotate.keys[i].time; > + keys[cur].dwID = 0; /* FIXME */ > + keys[cur].u.dqRotateKey = animation->rotate.keys[i].u.rotate; > + } > + } Minor, but note that it would probably be more convenient if d3drm_animation_get_range() returned a pointer to animation->rotate.keys[min] and a count.

1 0