February 2017 - Wine-Commits

Jacek Caban : mshtml: Added IHTMLDocument7:: onscroll property implementation.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: 59e146562ccecd8395a27dacbb37dcc14b347e80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e146562ccecd8395a27dacb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 16 16:35:26 2017 +0100 mshtml: Added IHTMLDocument7::onscroll property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index d0433ed..9ef11e9 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3779,15 +3779,19 @@ static HRESULT WINAPI HTMLDocument7_get_onreset(IHTMLDocument7 *iface, VARIANT * static HRESULT WINAPI HTMLDocument7_put_onscroll(IHTMLDocument7 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_SCROLL, &v); } static HRESULT WINAPI HTMLDocument7_get_onscroll(IHTMLDocument7 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_SCROLL, p); } static HRESULT WINAPI HTMLDocument7_put_onseekend(IHTMLDocument7 *iface, VARIANT v)

1 0

Sebastian Lackner : ntdll/tests: Add tests for FileIdInformation class.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: 8b3d43acab869d1846704c3170fc071b5e4a04fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3d43acab869d1846704c317… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 16 18:17:05 2017 +0100 ntdll/tests: Add tests for FileIdInformation class. Based on a patch by Jonathan Doron. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 57d7df9..e95815c 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3261,6 +3261,45 @@ static void test_file_all_name_information(void) HeapFree( GetProcessHeap(), 0, file_name ); } +static void test_file_id_information(void) +{ + BY_HANDLE_FILE_INFORMATION info; + FILE_ID_INFORMATION fid; + IO_STATUS_BLOCK io; + NTSTATUS status; + DWORD *dwords; + HANDLE h; + BOOL ret; + + if (!(h = create_temp_file(0))) return; + + memset( &fid, 0x11, sizeof(fid) ); + status = pNtQueryInformationFile( h, &io, &fid, sizeof(fid), FileIdInformation ); + if (status == STATUS_NOT_IMPLEMENTED || status == STATUS_INVALID_INFO_CLASS) + { + skip( "FileIdInformation not supported\n" ); + CloseHandle( h ); + return; + } + + memset( &info, 0x22, sizeof(info) ); + ret = GetFileInformationByHandle( h, &info ); + ok( ret, "GetFileInformationByHandle failed\n" ); + + dwords = (DWORD *)&fid.VolumeSerialNumber; + ok( dwords[0] == info.dwVolumeSerialNumber, "expected %08x, got %08x\n", + info.dwVolumeSerialNumber, dwords[0] ); + ok( dwords[1] != 0x11111111, "expected != 0x11111111\n" ); + + dwords = (DWORD *)&fid.FileId; + ok( dwords[0] == info.nFileIndexLow, "expected %08x, got %08x\n", info.nFileIndexLow, dwords[0] ); + ok( dwords[1] == info.nFileIndexHigh, "expected %08x, got %08x\n", info.nFileIndexHigh, dwords[1] ); + ok( dwords[2] == 0, "expected 0, got %08x\n", dwords[2] ); + ok( dwords[3] == 0, "expected 0, got %08x\n", dwords[3] ); + + CloseHandle( h ); +} + static void test_query_volume_information_file(void) { NTSTATUS status; @@ -4260,6 +4299,7 @@ START_TEST(file) test_file_rename_information(); test_file_link_information(); test_file_disposition_information(); + test_file_id_information(); test_query_volume_information_file(); test_query_attribute_information_file(); }

1 0

Sebastian Lackner : ntdll: Implement FileIdInformation class in NtQueryInformationFile.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: 627829daa3d4f06c353a40af38ff3df85ad8f887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=627829daa3d4f06c353a40af3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 16 18:17:51 2017 +0100 ntdll: Implement FileIdInformation class in NtQueryInformationFile. Based on a patch by Jonathan Doron. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 12 +++++++++++- dlls/ntdll/tests/file.c | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index f3ff163..fd7f3dd 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2375,7 +2375,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, 0, /* FileRenameInformationBypassAccessCheck */ 0, /* FileLinkInformationBypassAccessCheck */ 0, /* FileVolumeNameInformation */ - 0, /* FileIdInformation */ + sizeof(FILE_ID_INFORMATION), /* FileIdInformation */ 0, /* FileIdExtdDirectoryInformation */ 0, /* FileReplaceCompletionInformation */ 0, /* FileHardLinkFullIdInformation */ @@ -2617,6 +2617,16 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, } } break; + case FileIdInformation: + if (fd_get_file_info( fd, &st, &attr ) == -1) io->u.Status = FILE_GetNtStatus(); + else + { + FILE_ID_INFORMATION *info = ptr; + info->VolumeSerialNumber = 0; /* FIXME */ + memset( &info->FileId, 0, sizeof(info->FileId) ); + *(ULONGLONG *)&info->FileId = st.st_ino; + } + break; default: FIXME("Unsupported class (%d)\n", class); io->u.Status = STATUS_NOT_IMPLEMENTED; diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index e95815c..1a02ce5 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3277,7 +3277,7 @@ static void test_file_id_information(void) status = pNtQueryInformationFile( h, &io, &fid, sizeof(fid), FileIdInformation ); if (status == STATUS_NOT_IMPLEMENTED || status == STATUS_INVALID_INFO_CLASS) { - skip( "FileIdInformation not supported\n" ); + win_skip( "FileIdInformation not supported\n" ); CloseHandle( h ); return; }

1 0

Zebediah Figura : storage.dll16: Simplify operations in IStream16::Seek.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: 3085e7339210ce946481150f9dd55bb5b3c824a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3085e7339210ce946481150f9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 14 09:41:53 2017 -0600 storage.dll16: Simplify operations in IStream16::Seek. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/storage.dll16/storage.c | 63 ++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 37 deletions(-) diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c index 74aa7f9..2ce3571 100644 --- a/dlls/storage.dll16/storage.c +++ b/dlls/storage.dll16/storage.c @@ -1179,44 +1179,33 @@ ULONG CDECL IStream16_fnRelease(IStream16 *iface) * Does not handle 64 bits */ HRESULT CDECL IStream16_fnSeek(IStream16 *iface, LARGE_INTEGER offset, DWORD whence, - ULARGE_INTEGER *newpos) + ULARGE_INTEGER *newpos) { - IStream16Impl *This = impl_from_IStream16(iface); - TRACE_(relay)("(%p)->([%d.%d],%d,%p)\n",This,offset.u.HighPart,offset.u.LowPart,whence,newpos); - - switch (whence) { - /* unix SEEK_xx should be the same as win95 ones */ - case SEEK_SET: - /* offset must be ==0 (<0 is invalid, and >0 cannot be handled - * right now. - */ - assert(offset.u.HighPart==0); - This->offset.u.HighPart = offset.u.HighPart; - This->offset.u.LowPart = offset.u.LowPart; - break; - case SEEK_CUR: - if (offset.u.HighPart < 0) { - /* FIXME: is this negation correct ? */ - offset.u.HighPart = -offset.u.HighPart; - offset.u.LowPart = (0xffffffff ^ offset.u.LowPart)+1; - - assert(offset.u.HighPart==0); - assert(This->offset.u.LowPart >= offset.u.LowPart); - This->offset.u.LowPart -= offset.u.LowPart; - } else { - assert(offset.u.HighPart==0); - This->offset.u.LowPart+= offset.u.LowPart; - } - break; - case SEEK_END: - assert(offset.u.HighPart==0); - This->offset.u.LowPart = This->stde.pps_size-offset.u.LowPart; - break; - } - if (This->offset.u.LowPart>This->stde.pps_size) - This->offset.u.LowPart=This->stde.pps_size; - if (newpos) *newpos = This->offset; - return S_OK; + IStream16Impl *This = impl_from_IStream16(iface); + TRACE_(relay)("(%p)->([%d.%d],%d,%p)\n",This,offset.u.HighPart,offset.u.LowPart,whence,newpos); + + switch (whence) { + case STREAM_SEEK_SET: + This->offset.QuadPart = offset.QuadPart; + break; + case STREAM_SEEK_CUR: + if ((offset.QuadPart < 0 && -offset.QuadPart > This->offset.QuadPart) || + (offset.QuadPart > 0 && -offset.QuadPart <= This->offset.QuadPart)) + return STG_E_INVALIDFUNCTION; + This->offset.QuadPart += offset.QuadPart; + break; + case STREAM_SEEK_END: + if (-offset.QuadPart > This->stde.pps_size) + return STG_E_INVALIDFUNCTION; + + This->offset.QuadPart = This->stde.pps_size + offset.QuadPart; + break; + } + + if (This->offset.QuadPart>This->stde.pps_size) + This->offset.QuadPart=This->stde.pps_size; + if (newpos) *newpos = This->offset; + return S_OK; } /******************************************************************************

1 0

Józef Kucia : wined3d: Recognize SM5 imm_atomic_imax opcode.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: 1a0042df77e46b89d8092b377e1c32e5bdee75d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a0042df77e46b89d8092b377… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 16 13:02:19 2017 +0100 wined3d: Recognize SM5 imm_atomic_imax opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7ed83f4..3e32cab 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5143,6 +5143,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_IADD */ NULL, + /* WINED3DSIH_IMM_ATOMIC_IMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9900b08..ff24a92 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9344,6 +9344,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMM_ATOMIC_EXCH */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_IADD */ shader_glsl_atomic, + /* WINED3DSIH_IMM_ATOMIC_IMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 4a31ff5..0a07253 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -163,6 +163,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMM_ATOMIC_CONSUME */ "imm_atomic_consume", /* WINED3DSIH_IMM_ATOMIC_EXCH */ "imm_atomic_exch", /* WINED3DSIH_IMM_ATOMIC_IADD */ "imm_atomic_iadd", + /* WINED3DSIH_IMM_ATOMIC_IMAX */ "imm_atomic_imax", /* WINED3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or", /* WINED3DSIH_IMM_ATOMIC_UMAX */ "imm_atomic_umax", /* WINED3DSIH_IMM_ATOMIC_UMIN */ "imm_atomic_umin", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index dff463f..44a9da9 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -283,6 +283,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_IMM_ATOMIC_XOR = 0xb7, WINED3D_SM5_OP_IMM_ATOMIC_EXCH = 0xb8, WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH = 0xb9, + WINED3D_SM5_OP_IMM_ATOMIC_IMAX = 0xba, WINED3D_SM5_OP_IMM_ATOMIC_UMAX = 0xbc, WINED3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, WINED3D_SM5_OP_SYNC = 0xbe, @@ -1009,6 +1010,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_IMM_ATOMIC_XOR, WINED3DSIH_IMM_ATOMIC_XOR, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_EXCH, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH, WINED3DSIH_IMM_ATOMIC_CMP_EXCH, "uU", "iuu"}, + {WINED3D_SM5_OP_IMM_ATOMIC_IMAX, WINED3DSIH_IMM_ATOMIC_IMAX, "iU", "ii"}, {WINED3D_SM5_OP_IMM_ATOMIC_UMAX, WINED3DSIH_IMM_ATOMIC_UMAX, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_UMIN, WINED3DSIH_IMM_ATOMIC_UMIN, "uU", "iu"}, {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e40e8dc..9d63983 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -694,6 +694,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_IADD, + WINED3DSIH_IMM_ATOMIC_IMAX, WINED3DSIH_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_UMAX, WINED3DSIH_IMM_ATOMIC_UMIN,

1 0

Francois Gouget : dwrite/tests: Add a __WINE_ALLOC_SIZE attribute to heap_alloc().
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: f9ef81b3c029696d6d621d870de1d3ce54769629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ef81b3c029696d6d621d870… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 11 14:18:46 2017 +0100 dwrite/tests: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). And standardize its parameter name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index c373d14..52c64ab 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -91,9 +91,9 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } static inline BOOL heap_free(void *mem)

1 0

Carlo Bramini : winmm: Fix wrong return type for midiInOpen and midiOutOpen.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: 23439a0ae8a12cab5e9f56a061e7f094e7903818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23439a0ae8a12cab5e9f56a06… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sun Feb 12 13:58:55 2017 +0100 winmm: Fix wrong return type for midiInOpen and midiOutOpen. Signed-off-by: Carlo Bramini <carlo_bramini(a)users.sourceforge.net> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/winmm.c | 8 ++++---- include/mmsystem.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 0f3cd5d..1412d5e 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -413,12 +413,12 @@ static LPWINE_MIDI MIDI_OutAlloc(HMIDIOUT* lphMidiOut, DWORD_PTR* lpdwCallback, /************************************************************************** * midiOutOpen [WINMM.@] */ -UINT WINAPI midiOutOpen(LPHMIDIOUT lphMidiOut, UINT uDeviceID, +MMRESULT WINAPI midiOutOpen(LPHMIDIOUT lphMidiOut, UINT uDeviceID, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags) { HMIDIOUT hMidiOut; LPWINE_MIDI lpwm; - UINT dwRet; + MMRESULT dwRet; TRACE("(%p, %d, %08lX, %08lX, %08X);\n", lphMidiOut, uDeviceID, dwCallback, dwInstance, dwFlags); @@ -699,12 +699,12 @@ UINT WINAPI midiInGetDevCapsA(UINT_PTR uDeviceID, LPMIDIINCAPSA lpCaps, UINT uSi /************************************************************************** * midiInOpen [WINMM.@] */ -UINT WINAPI midiInOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, +MMRESULT WINAPI midiInOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags) { HANDLE hMidiIn; LPWINE_MIDI lpwm; - DWORD dwRet; + MMRESULT dwRet; TRACE("(%p, %d, %08lX, %08lX, %08X);\n", lphMidiIn, uDeviceID, dwCallback, dwInstance, dwFlags); diff --git a/include/mmsystem.h b/include/mmsystem.h index f53f11d..721e5e6 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -778,7 +778,7 @@ UINT WINAPI midiOutSetVolume(HMIDIOUT,DWORD); UINT WINAPI midiOutGetErrorTextA(UINT,LPSTR,UINT); UINT WINAPI midiOutGetErrorTextW(UINT,LPWSTR,UINT); #define midiOutGetErrorText WINELIB_NAME_AW(midiOutGetErrorText) -UINT WINAPI midiOutOpen(LPHMIDIOUT,UINT,DWORD_PTR,DWORD_PTR,DWORD); +MMRESULT WINAPI midiOutOpen(LPHMIDIOUT,UINT,DWORD_PTR,DWORD_PTR,DWORD); UINT WINAPI midiOutClose(HMIDIOUT); UINT WINAPI midiOutPrepareHeader(HMIDIOUT,MIDIHDR*,UINT); UINT WINAPI midiOutUnprepareHeader(HMIDIOUT,MIDIHDR*,UINT); @@ -797,7 +797,7 @@ UINT WINAPI midiInGetDevCapsW(UINT_PTR,LPMIDIINCAPSW,UINT); UINT WINAPI midiInGetErrorTextA(UINT,LPSTR,UINT); UINT WINAPI midiInGetErrorTextW(UINT,LPWSTR,UINT); #define midiInGetErrorText WINELIB_NAME_AW(midiInGetErrorText) -UINT WINAPI midiInOpen(LPHMIDIIN,UINT,DWORD_PTR,DWORD_PTR,DWORD); +MMRESULT WINAPI midiInOpen(LPHMIDIIN,UINT,DWORD_PTR,DWORD_PTR,DWORD); UINT WINAPI midiInClose(HMIDIIN); UINT WINAPI midiInPrepareHeader(HMIDIIN,MIDIHDR*,UINT); UINT WINAPI midiInUnprepareHeader(HMIDIIN,MIDIHDR*,UINT);

1 0

Henri Verbeet : wined3d: Send sampler GL initialisation through the command stream.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: 9e2498f25e47d64a044c51f2abf60e3104bd4bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e2498f25e47d64a044c51f2a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 16 00:58:53 2017 +0100 wined3d: Send sampler GL initialisation through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/cs.c | 26 ++++++++++++++++++-------- dlls/wined3d/palette.c | 2 +- dlls/wined3d/query.c | 2 +- dlls/wined3d/resource.c | 2 +- dlls/wined3d/sampler.c | 25 ++++++++++++++++--------- dlls/wined3d/shader.c | 2 +- dlls/wined3d/state.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/view.c | 6 +++--- dlls/wined3d/wined3d_private.h | 7 ++++--- 12 files changed, 49 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e2498f25e47d64a044c5…

1 0

Henri Verbeet : wined3d: Send shader resource view GL initialisation through the command stream.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: a772bbdfdaec60131a2068ee6ecac205fabe8242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a772bbdfdaec60131a2068ee6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 16 00:58:54 2017 +0100 wined3d: Send shader resource view GL initialisation through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 121 +++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 3 + 2 files changed, 78 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 7919e2e..50e6e0a 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -177,7 +177,7 @@ static void create_buffer_texture(struct wined3d_gl_view *view, context_release(context); } -static HRESULT create_buffer_view(struct wined3d_gl_view *view, +static void create_buffer_view(struct wined3d_gl_view *view, const struct wined3d_view_desc *desc, struct wined3d_buffer *buffer, const struct wined3d_format *view_format) { @@ -186,22 +186,13 @@ static HRESULT create_buffer_view(struct wined3d_gl_view *view, if (desc->format_id == WINED3DFMT_UNKNOWN) { FIXME("Structured buffer views not supported.\n"); - return WINED3D_OK; + return; } - if (desc->u.buffer.start_idx > ~0u / view_format->byte_count - || desc->u.buffer.count > ~0u / view_format->byte_count) - return E_INVALIDARG; - offset = desc->u.buffer.start_idx * view_format->byte_count; size = desc->u.buffer.count * view_format->byte_count; - if (offset >= buffer->resource.size - || size > buffer->resource.size - offset) - return E_INVALIDARG; - create_buffer_texture(view, buffer, view_format, offset, size); - return WINED3D_OK; } ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view) @@ -476,13 +467,61 @@ void * CDECL wined3d_shader_resource_view_get_parent(const struct wined3d_shader return view->parent; } +static void wined3d_shader_resource_view_cs_init(void *object) +{ + struct wined3d_shader_resource_view *view = object; + struct wined3d_resource *resource = view->resource; + const struct wined3d_format *view_format; + const struct wined3d_gl_info *gl_info; + const struct wined3d_view_desc *desc; + GLenum view_target; + + view_format = view->format; + gl_info = &resource->device->adapter->gl_info; + desc = &view->desc; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + struct wined3d_buffer *buffer = buffer_from_resource(resource); + + create_buffer_view(&view->gl_view, desc, buffer, view_format); + } + else + { + struct wined3d_texture *texture = texture_from_resource(resource); + + view_target = get_texture_view_target(gl_info, desc, texture); + + if (resource->format->id == view_format->id && texture->target == view_target + && !desc->u.texture.level_idx && desc->u.texture.level_count == texture->level_count + && !desc->u.texture.layer_idx && desc->u.texture.layer_count == texture->layer_count + && !is_stencil_view_format(view_format)) + { + TRACE("Creating identity shader resource view.\n"); + } + else if (texture->swapchain && texture->swapchain->desc.backbuffer_count > 1) + { + FIXME("Swapchain shader resource views not supported.\n"); + } + else if (resource->format->typeless_id == view_format->typeless_id + && resource->format->gl_view_class == view_format->gl_view_class) + { + create_texture_view(&view->gl_view, view_target, desc, texture, view_format); + } + else + { + FIXME("Shader resource view not supported, resource format %s, view format %s.\n", + debug_d3dformat(resource->format->id), debug_d3dformat(view_format->id)); + } + } +} + static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_view *view, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; const struct wined3d_format *view_format; - GLenum view_target; view_format = wined3d_get_format(gl_info, desc->format_id, resource->usage); if (resource->type == WINED3D_RTYPE_BUFFER && desc->flags & WINED3D_VIEW_BUFFER_RAW) @@ -502,17 +541,17 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ return E_INVALIDARG; } - view->refcount = 1; - view->parent = parent; - view->parent_ops = parent_ops; - if (resource->type == WINED3D_RTYPE_BUFFER) { struct wined3d_buffer *buffer = buffer_from_resource(resource); - HRESULT hr; - if (FAILED(hr = create_buffer_view(&view->gl_view, desc, buffer, view_format))) - return hr; + if (view_format->byte_count) + { + unsigned int buffer_size = buffer->resource.size / view_format->byte_count; + if (desc->u.buffer.start_idx >= buffer_size + || desc->u.buffer.count > buffer_size - desc->u.buffer.start_idx) + return E_INVALIDARG; + } } else { @@ -525,32 +564,16 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ || desc->u.texture.layer_idx >= texture->layer_count || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx) return E_INVALIDARG; - - view_target = get_texture_view_target(gl_info, desc, texture); - - if (resource->format->id == view_format->id && texture->target == view_target - && !desc->u.texture.level_idx && desc->u.texture.level_count == texture->level_count - && !desc->u.texture.layer_idx && desc->u.texture.layer_count == texture->layer_count - && !is_stencil_view_format(view_format)) - { - TRACE("Creating identity shader resource view.\n"); - } - else if (texture->swapchain && texture->swapchain->desc.backbuffer_count > 1) - { - FIXME("Swapchain shader resource views not supported.\n"); - } - else if (resource->format->typeless_id == view_format->typeless_id - && resource->format->gl_view_class == view_format->gl_view_class) - { - create_texture_view(&view->gl_view, view_target, desc, texture, view_format); - } - else - { - FIXME("Shader resource view not supported, resource format %s, view format %s.\n", - debug_d3dformat(resource->format->id), debug_d3dformat(view_format->id)); - } } + + view->refcount = 1; wined3d_resource_incref(view->resource = resource); + view->parent = parent; + view->parent_ops = parent_ops; + view->format = view_format; + view->desc = *desc; + + wined3d_cs_init_object(resource->device->cs, wined3d_shader_resource_view_cs_init, view); return WINED3D_OK; } @@ -696,10 +719,16 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces if (resource->type == WINED3D_RTYPE_BUFFER) { struct wined3d_buffer *buffer = buffer_from_resource(resource); - HRESULT hr; - if (FAILED(hr = create_buffer_view(&view->gl_view, desc, buffer, view->format))) - return hr; + if (view->format->byte_count) + { + unsigned int buffer_size = buffer->resource.size / view->format->byte_count; + if (desc->u.buffer.start_idx >= buffer_size + || desc->u.buffer.count > buffer_size - desc->u.buffer.start_idx) + return E_INVALIDARG; + } + + create_buffer_view(&view->gl_view, desc, buffer, view->format); } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f6b42e5..512d33d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3352,6 +3352,9 @@ struct wined3d_shader_resource_view void *parent; const struct wined3d_parent_ops *parent_ops; + const struct wined3d_format *format; + struct wined3d_view_desc desc; + struct wined3d_gl_view gl_view; };

1 0

Henri Verbeet : wined3d: Send unordered access view GL initialisation through the command stream.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: 392213efb26207692c46e1fbc197a045f7948fa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=392213efb26207692c46e1fbc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 16 00:58:55 2017 +0100 wined3d: Send unordered access view GL initialisation through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/view.c | 53 +++++++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 5 ++-- 3 files changed, 42 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 39be229..cb1935a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3463,7 +3463,7 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, else if (texture) { texture_name = wined3d_texture_get_gl_texture(texture, FALSE)->name; - level = view->level_idx; + level = view->desc.u.texture.level_idx; } else { diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 50e6e0a..2c411ff 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -682,12 +682,45 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ texture = texture_from_resource(resource); - sub_resource_idx = view->layer_idx * texture->level_count + view->level_idx; - layer_count = (resource->type != WINED3D_RTYPE_TEXTURE_3D) ? view->layer_count : 1; + sub_resource_idx = view->desc.u.texture.layer_idx * texture->level_count + view->desc.u.texture.level_idx; + layer_count = (resource->type != WINED3D_RTYPE_TEXTURE_3D) ? view->desc.u.texture.layer_count : 1; for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) wined3d_texture_invalidate_location(texture, sub_resource_idx, location); } +static void wined3d_unordered_access_view_cs_init(void *object) +{ + struct wined3d_unordered_access_view *view = object; + struct wined3d_resource *resource = view->resource; + struct wined3d_view_desc *desc = &view->desc; + const struct wined3d_gl_info *gl_info; + + gl_info = &resource->device->adapter->gl_info; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + struct wined3d_buffer *buffer = buffer_from_resource(resource); + + create_buffer_view(&view->gl_view, desc, buffer, view->format); + } + else + { + struct wined3d_texture *texture = texture_from_resource(resource); + unsigned int depth_or_layer_count; + + if (resource->type == WINED3D_RTYPE_TEXTURE_3D) + depth_or_layer_count = wined3d_texture_get_level_depth(texture, desc->u.texture.level_idx); + else + depth_or_layer_count = texture->layer_count; + + if (desc->u.texture.layer_idx || desc->u.texture.layer_count != depth_or_layer_count) + { + create_texture_view(&view->gl_view, get_texture_view_target(gl_info, desc, texture), + desc, texture, view->format); + } + } +} + static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_access_view *view, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) @@ -699,6 +732,8 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces view->parent_ops = parent_ops; view->format = wined3d_get_format(gl_info, desc->format_id, resource->usage); + view->desc = *desc; + if (resource->type == WINED3D_RTYPE_BUFFER && desc->flags & WINED3D_VIEW_BUFFER_RAW) { if (view->format->id != WINED3DFMT_R32_TYPELESS) @@ -727,8 +762,6 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces || desc->u.buffer.count > buffer_size - desc->u.buffer.start_idx) return E_INVALIDARG; } - - create_buffer_view(&view->gl_view, desc, buffer, view->format); } else { @@ -746,19 +779,11 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces || !desc->u.texture.layer_count || desc->u.texture.layer_count > depth_or_layer_count - desc->u.texture.layer_idx) return E_INVALIDARG; - - if (desc->u.texture.layer_idx || desc->u.texture.layer_count != depth_or_layer_count) - { - create_texture_view(&view->gl_view, get_texture_view_target(gl_info, desc, texture), - desc, texture, view->format); - } - - view->layer_idx = desc->u.texture.layer_idx; - view->layer_count = desc->u.texture.layer_count; - view->level_idx = desc->u.texture.level_idx; } wined3d_resource_incref(view->resource = resource); + wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_cs_init, view); + return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 512d33d..e40e8dc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3370,10 +3370,9 @@ struct wined3d_unordered_access_view const struct wined3d_parent_ops *parent_ops; const struct wined3d_format *format; + struct wined3d_view_desc desc; + struct wined3d_gl_view gl_view; - unsigned int layer_idx; - unsigned int layer_count; - unsigned int level_idx; }; void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_access_view *view,

1 0