May 2018 - Wine-Devel - list.winehq.org

[Patch v2] Update the Korean po file
by 김건우 May 29, 2018

May 29, 2018

Signed-off-by: 김건우 Kim Geonwoo <rlarjsdn122(a)naver.com>

1 0

[PATCH vkd3d 1/6] build: Do not drop AM_CFLAGS when adding per-target CFLAGS.
by Józef Kucia May 29, 2018

May 29, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 494e3788b1a7..52b35859a546 100644 --- a/Makefile.am +++ b/Makefile.am @@ -71,7 +71,7 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/vkd3d_shader.map \ libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_private.h -libvkd3d_shader_la_CFLAGS = @SPIRV_TOOLS_CFLAGS@ +libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) @SPIRV_TOOLS_CFLAGS@ libvkd3d_shader_la_LIBADD = @SPIRV_TOOLS_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_shader_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map @@ -130,7 +130,7 @@ tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ -DEMOS_CFLAGS = @XCB_CFLAGS@ +DEMOS_CFLAGS = $(AM_CFLAGS) @XCB_CFLAGS@ noinst_PROGRAMS += $(vkd3d_demos) EXTRA_DIST += $(vkd3d_test_headers) $(vkd3d_demos_headers) -- 2.16.1

2 11

[PATCH 3/3 v3] winmm: Reset the tick counter after handling messages. (rebased)
by Andrew Eikum May 29, 2018

May 29, 2018

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Otherwise, events might be triggered immediately after a resuming. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v3: rebased dlls/winmm/tests/midi.c | 4 ++-- dlls/winmm/winmm.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 091a500db7..fe3cc5c876 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -893,7 +893,7 @@ static void test_midiStream(UINT udev, HWND hwnd) expected = 250; /* = 12 ticks in 120 BPM */ ret = get_position(hm, TIME_MS); - todo_wine ok(ret >= expected - MARGIN && ret <= expected + MARGIN, + ok(ret >= expected - MARGIN && ret <= expected + MARGIN, "expected greater than %ums, got %ums\n", expected, ret); trace("after playing, got %ums\n", ret); @@ -914,7 +914,7 @@ static void test_midiStream(UINT udev, HWND hwnd) So, the second event happens at dwDeltaTime(250ms) + 100ms after the first event. */ expected = 250 + 100; diff = records.time_stamp[1] - records.time_stamp[0]; - todo_wine ok(diff >= expected - MARGIN && diff <= expected + MARGIN, + ok(diff >= expected - MARGIN && diff <= expected + MARGIN, "expected %u ~ %ums, got %ums (dev=%d)\n", expected - MARGIN, expected + MARGIN, diff, udev); rc = midiOutUnprepareHeader((HMIDIOUT)hm, &mhdr, sizeof(mhdr)); diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 2031c79d1c..ef7dcdfc9a 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1197,6 +1197,8 @@ start_header: goto start_header; } } + /* reset dwToGo because dwStartTicks might be updated */ + dwToGo = lpMidiStrm->dwStartTicks + lpMidiStrm->dwPositionMS; } else { /* timeout, so me->dwDeltaTime is elapsed, can break the while loop */ break; -- 2.17.0

1 0

[PATCH 2/3 v3] winmm: Return a continuous stream position in MIDI stream. (rebased)
by Andrew Eikum May 29, 2018

May 29, 2018

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v3: rebased dlls/winmm/tests/midi.c | 8 ++++---- dlls/winmm/winmm.c | 37 +++++++++++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index c78e465782..091a500db7 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -869,7 +869,7 @@ static void test_midiStream(UINT udev, HWND hwnd) expected = 50; ret = get_position(hm, TIME_MS); - todo_wine ok(ret >= expected && ret < expected + MARGIN, "expected %ums or greater, got %ums\n", expected, ret); + ok(ret >= expected && ret < expected + MARGIN, "expected %ums or greater, got %ums\n", expected, ret); expected = ret; Sleep(100); @@ -882,7 +882,7 @@ static void test_midiStream(UINT udev, HWND hwnd) Sleep(1); ret = get_position(hm, TIME_MS); - todo_wine ok(ret > expected && ret < expected + MARGIN, "expected greater than %ums, got %ums\n", expected, ret); + ok(ret > expected && ret < expected + MARGIN, "expected greater than %ums, got %ums\n", expected, ret); expected = ret; ret = WaitForSingleObject(records.done, INFINITE); @@ -893,7 +893,7 @@ static void test_midiStream(UINT udev, HWND hwnd) expected = 250; /* = 12 ticks in 120 BPM */ ret = get_position(hm, TIME_MS); - ok(ret >= expected - MARGIN && ret <= expected + MARGIN, + todo_wine ok(ret >= expected - MARGIN && ret <= expected + MARGIN, "expected greater than %ums, got %ums\n", expected, ret); trace("after playing, got %ums\n", ret); @@ -924,7 +924,7 @@ static void test_midiStream(UINT udev, HWND hwnd) ok(!rc, "midiStreamStop(dev=%d) rc=%s\n", udev, mmsys_error(rc)); ret = get_position(hm, TIME_MS); - todo_wine ok(ret == 0, "expected 0ms, got %ums\n", ret); + ok(ret == 0, "expected 0ms, got %ums\n", ret); rc = midiStreamClose(hm); ok(!rc, "midiStreamClose(dev=%d) rc=%s\n", udev, mmsys_error(rc)); diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 76807ab3c5..2031c79d1c 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -918,6 +918,7 @@ typedef struct WINE_MIDIStream { DWORD dwPositionMS; DWORD dwPulses; DWORD dwStartTicks; + DWORD dwElapsedMS; WORD wFlags; WORD status; HANDLE hEvent; @@ -973,6 +974,20 @@ static DWORD MMSYSTEM_MidiStream_Convert(WINE_MIDIStream* lpMidiStrm, DWORD puls return ret; } +static DWORD midistream_get_playing_position(WINE_MIDIStream* lpMidiStrm) +{ + switch (lpMidiStrm->status) { + case MSM_STATUS_STOPPED: + case MSM_STATUS_PAUSED: + return lpMidiStrm->dwElapsedMS; + case MSM_STATUS_PLAYING: + return GetTickCount() - lpMidiStrm->dwStartTicks; + default: + FIXME("Unknown playing status %hu\n", lpMidiStrm->status); + return 0; + } +} + /************************************************************************** * MMSYSTEM_MidiStream_MessageHandler [internal] */ @@ -988,7 +1003,11 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI return FALSE; case WINE_MSM_STOP: TRACE("STOP\n"); + EnterCriticalSection(&lpMidiStrm->lock); lpMidiStrm->status = MSM_STATUS_STOPPED; + lpMidiStrm->dwPulses = 0; + lpMidiStrm->dwElapsedMS = 0; + LeaveCriticalSection(&lpMidiStrm->lock); /* this is not quite what MS doc says... */ midiOutReset(lpMidiStrm->hDevice); /* empty list of already submitted buffers */ @@ -1008,13 +1027,22 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI return TRUE; case WINE_MSM_RESUME: /* FIXME: send out cc64 0 (turn off sustain pedal) on every channel */ - lpMidiStrm->dwStartTicks = GetTickCount() - lpMidiStrm->dwPositionMS; - lpMidiStrm->status = MSM_STATUS_PLAYING; + if (lpMidiStrm->status != MSM_STATUS_PLAYING) { + EnterCriticalSection(&lpMidiStrm->lock); + lpMidiStrm->dwStartTicks = GetTickCount() - lpMidiStrm->dwElapsedMS; + lpMidiStrm->status = MSM_STATUS_PLAYING; + LeaveCriticalSection(&lpMidiStrm->lock); + } SetEvent((HANDLE)msg->wParam); return TRUE; case WINE_MSM_PAUSE: /* FIXME: send out cc64 0 (turn off sustain pedal) on every channel */ - lpMidiStrm->status = MSM_STATUS_PAUSED; + if (lpMidiStrm->status != MSM_STATUS_PAUSED) { + EnterCriticalSection(&lpMidiStrm->lock); + lpMidiStrm->dwElapsedMS = GetTickCount() - lpMidiStrm->dwStartTicks; + lpMidiStrm->status = MSM_STATUS_PAUSED; + LeaveCriticalSection(&lpMidiStrm->lock); + } SetEvent((HANDLE)msg->wParam); break; /* FIXME(EPP): "I don't understand the content of the first MIDIHDR sent @@ -1302,6 +1330,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, lpMidiStrm->dwTimeDiv = 24; /* ticks per quarter note */ lpMidiStrm->dwPositionMS = 0; lpMidiStrm->status = MSM_STATUS_PAUSED; + lpMidiStrm->dwElapsedMS = 0; mosm.dwStreamID = (DWORD)lpMidiStrm; /* FIXME: the correct value is not allocated yet for MAPPER */ @@ -1460,7 +1489,7 @@ MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbm lpMMT->wType = TIME_MS; /* fall through to alternative format */ case TIME_MS: - lpMMT->u.ms = lpMidiStrm->dwPositionMS; + lpMMT->u.ms = midistream_get_playing_position(lpMidiStrm); TRACE("=> %d ms\n", lpMMT->u.ms); break; case TIME_TICKS: -- 2.17.0

1 0

[PATCH 1/3 v3] winmm: Synchronize player status and API calls.
by Andrew Eikum May 29, 2018

May 29, 2018

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v3: Fix leak, small code style changes. In v2, use an anoymous event object to avoid a race. dlls/winmm/winmm.c | 46 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index da87be2feb..76807ab3c5 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1004,15 +1004,18 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI (HDRVR)lpMidiStrm->hDevice, MM_MOM_DONE, lpwm->mod.dwInstance, (DWORD_PTR)lphdr, 0); } + SetEvent((HANDLE)msg->wParam); return TRUE; case WINE_MSM_RESUME: /* FIXME: send out cc64 0 (turn off sustain pedal) on every channel */ lpMidiStrm->dwStartTicks = GetTickCount() - lpMidiStrm->dwPositionMS; lpMidiStrm->status = MSM_STATUS_PLAYING; + SetEvent((HANDLE)msg->wParam); return TRUE; case WINE_MSM_PAUSE: /* FIXME: send out cc64 0 (turn off sustain pedal) on every channel */ lpMidiStrm->status = MSM_STATUS_PAUSED; + SetEvent((HANDLE)msg->wParam); break; /* FIXME(EPP): "I don't understand the content of the first MIDIHDR sent * by native mcimidi, it doesn't look like a correct one". @@ -1387,20 +1390,49 @@ MMRESULT WINAPI midiStreamOut(HMIDISTRM hMidiStrm, LPMIDIHDR lpMidiHdr, return ret; } +static MMRESULT midistream_post_message_and_wait(WINE_MIDIStream* lpMidiStrm, UINT msg, LPARAM lParam) +{ + HANDLE hObjects[2]; + + hObjects[0] = CreateEventW(NULL, FALSE, FALSE, NULL); + if (!hObjects[0]) + return MMSYSERR_ERROR; + + if (!PostThreadMessageA(lpMidiStrm->dwThreadID, msg, (WPARAM)hObjects[0], lParam)) { + WARN("bad PostThreadMessage\n"); + CloseHandle(hObjects[0]); + return MMSYSERR_ERROR; + } + + if (GetCurrentThreadId() != lpMidiStrm->dwThreadID) { + DWORD ret; + hObjects[1] = lpMidiStrm->hThread; + ret = WaitForMultipleObjects(sizeof(hObjects)/sizeof(hObjects[0]), hObjects, + FALSE, INFINITE); + if (ret != WAIT_OBJECT_0) { + CloseHandle(hObjects[0]); + WARN("bad WaitForSingleObject (%u)\n", ret); + return MMSYSERR_ERROR; + } + } + + CloseHandle(hObjects[0]); + + return MMSYSERR_NOERROR; +} + /************************************************************************** * midiStreamPause [WINMM.@] */ MMRESULT WINAPI midiStreamPause(HMIDISTRM hMidiStrm) { WINE_MIDIStream* lpMidiStrm; - DWORD ret = MMSYSERR_NOERROR; TRACE("(%p)!\n", hMidiStrm); if (!MMSYSTEM_GetMidiStream(hMidiStrm, &lpMidiStrm, NULL)) return MMSYSERR_INVALHANDLE; - PostThreadMessageA(lpMidiStrm->dwThreadID, WINE_MSM_PAUSE, 0, 0); - return ret; + return midistream_post_message_and_wait(lpMidiStrm, WINE_MSM_PAUSE, 0); } /************************************************************************** @@ -1496,14 +1528,12 @@ MMRESULT WINAPI midiStreamProperty(HMIDISTRM hMidiStrm, LPBYTE lpPropData, DWORD MMRESULT WINAPI midiStreamRestart(HMIDISTRM hMidiStrm) { WINE_MIDIStream* lpMidiStrm; - MMRESULT ret = MMSYSERR_NOERROR; TRACE("(%p)!\n", hMidiStrm); if (!MMSYSTEM_GetMidiStream(hMidiStrm, &lpMidiStrm, NULL)) return MMSYSERR_INVALHANDLE; - PostThreadMessageA(lpMidiStrm->dwThreadID, WINE_MSM_RESUME, 0, 0); - return ret; + return midistream_post_message_and_wait(lpMidiStrm, WINE_MSM_RESUME, 0); } /************************************************************************** @@ -1512,14 +1542,12 @@ MMRESULT WINAPI midiStreamRestart(HMIDISTRM hMidiStrm) MMRESULT WINAPI midiStreamStop(HMIDISTRM hMidiStrm) { WINE_MIDIStream* lpMidiStrm; - MMRESULT ret = MMSYSERR_NOERROR; TRACE("(%p)!\n", hMidiStrm); if (!MMSYSTEM_GetMidiStream(hMidiStrm, &lpMidiStrm, NULL)) return MMSYSERR_INVALHANDLE; - PostThreadMessageA(lpMidiStrm->dwThreadID, WINE_MSM_STOP, 0, 0); - return ret; + return midistream_post_message_and_wait(lpMidiStrm, WINE_MSM_STOP, 0); } struct mm_starter -- 2.17.0

1 0

[PATCH v2 1/3] include: Add wmemcpy to wchar.h
by Alex Henrie May 29, 2018

May 29, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- For https://bugs.winehq.org/show_bug.cgi?id=43300 include/msvcrt/wchar.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 984bd31c6f..4a6b788273 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -10,6 +10,7 @@ #include <crtdefs.h> #include <stdarg.h> +#include <string.h> #include <pshpack8.h> @@ -495,6 +496,11 @@ static inline int wmemcmp(const wchar_t *s1, const wchar_t *s2, size_t n) return 0; } +static inline wchar_t* __cdecl wmemcpy(wchar_t *dst, const wchar_t *src, size_t n) +{ + return memcpy(dst, src, n * sizeof(wchar_t)); +} + #ifdef __cplusplus } #endif -- 2.17.0

2 5

[PATCH] wined3d: Sort WINED3DSIH enum values.
by Józef Kucia May 29, 2018

May 29, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4fbb3a59ecdb..c05dca0046a2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5084,7 +5084,6 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DSY */ shader_hw_dsy, /* WINED3DSIH_DSY_COARSE */ NULL, /* WINED3DSIH_DSY_FINE */ NULL, - /* WINED3DSIH_EVAL_SAMPLE_INDEX */ NULL, /* WINED3DSIH_ELSE */ shader_hw_else, /* WINED3DSIH_EMIT */ NULL, /* WINED3DSIH_EMIT_STREAM */ NULL, @@ -5093,6 +5092,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ENDREP */ shader_hw_endrep, /* WINED3DSIH_ENDSWITCH */ NULL, /* WINED3DSIH_EQ */ NULL, + /* WINED3DSIH_EVAL_SAMPLE_INDEX */ NULL, /* WINED3DSIH_EXP */ shader_hw_scalar_op, /* WINED3DSIH_EXPP */ shader_hw_scalar_op, /* WINED3DSIH_F16TOF32 */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0d0e25a47755..3692a276518c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11292,7 +11292,6 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DSY */ shader_glsl_map2gl, /* WINED3DSIH_DSY_COARSE */ shader_glsl_map2gl, /* WINED3DSIH_DSY_FINE */ shader_glsl_map2gl, - /* WINED3DSIH_EVAL_SAMPLE_INDEX */ NULL, /* WINED3DSIH_ELSE */ shader_glsl_else, /* WINED3DSIH_EMIT */ shader_glsl_emit, /* WINED3DSIH_EMIT_STREAM */ shader_glsl_emit, @@ -11301,6 +11300,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ENDREP */ shader_glsl_end, /* WINED3DSIH_ENDSWITCH */ shader_glsl_end, /* WINED3DSIH_EQ */ shader_glsl_relop, + /* WINED3DSIH_EVAL_SAMPLE_INDEX */ NULL, /* WINED3DSIH_EXP */ shader_glsl_scalar_op, /* WINED3DSIH_EXPP */ shader_glsl_expp, /* WINED3DSIH_F16TOF32 */ shader_glsl_float16, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3a0a3022172f..8a6307a3edb1 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -125,7 +125,6 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DSY */ "dsy", /* WINED3DSIH_DSY_COARSE */ "deriv_rty_coarse", /* WINED3DSIH_DSY_FINE */ "deriv_rty_fine", - /* WINED3DSIH_EVAL_SAMPLE_INDEX */ "eval_sample_index", /* WINED3DSIH_ELSE */ "else", /* WINED3DSIH_EMIT */ "emit", /* WINED3DSIH_EMIT_STREAM */ "emit_stream", @@ -134,6 +133,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ENDREP */ "endrep", /* WINED3DSIH_ENDSWITCH */ "endswitch", /* WINED3DSIH_EQ */ "eq", + /* WINED3DSIH_EVAL_SAMPLE_INDEX */ "eval_sample_index", /* WINED3DSIH_EXP */ "exp", /* WINED3DSIH_EXPP */ "expp", /* WINED3DSIH_F16TOF32 */ "f16tof32", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f2c4cd669cf1..164513325065 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -771,7 +771,6 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DSY, WINED3DSIH_DSY_COARSE, WINED3DSIH_DSY_FINE, - WINED3DSIH_EVAL_SAMPLE_INDEX, WINED3DSIH_ELSE, WINED3DSIH_EMIT, WINED3DSIH_EMIT_STREAM, @@ -780,6 +779,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ENDREP, WINED3DSIH_ENDSWITCH, WINED3DSIH_EQ, + WINED3DSIH_EVAL_SAMPLE_INDEX, WINED3DSIH_EXP, WINED3DSIH_EXPP, WINED3DSIH_F16TOF32, -- 2.16.1

2 1

[PATCH 1/6] wined3d: Expose wined3d_shader_type enum and wined3d_device_*_constant_buffer methods.
by Pablo Martin May 29, 2018

May 29, 2018

Signed-off-by: Pablo Martin <pmart-wine(a)riseup.net> --- Tested on Ubuntu 17.10. This patch series is a preparation for implementing the Get/SetConstantBuffer1 methods in an upcoming series. Those methods will also be reusing the same code, so in the end 12 functions are reusing the code for each method. This series makes the upcoming one much more reasonable by removing duplicated code that with the next series would become even more duplicated. Here goes a small explanation of each patch role in this series: 0001: To implement the helper method, it is needed to directly call the wined3d constant_buffer methods, instead of relying on the intermediate methods, so the first step here is exposing those and the associated enum. Also adds new trace in the methods since atm just the intermediate ones are tracing. 000[23]: Implements the actual helper methods for d3d11, this is what is need for the next series. The rest of the series is just continuing the refactor until the specific methods can be completely removed and we make good use of the newly exposed generic methods everywhere. I don't really need these for the next series, but I think it makes sense. 000[45]: Helper methods for d3d10 similar to the ones from 2 and 3. 0006: Remove the specific methods and all remaining uses (just in ClearState). A similar refactoring can be done later for XX[SG]etShaderResources and XX[SG]etShaderSamplers methods reducing a bit of duplicate code and also removing even more specific methods from wined3d. Also note how then ClearState will have just one loop over SHADER_TYPES in the end. dlls/wined3d/device.c | 8 ++++++-- dlls/wined3d/wined3d.spec | 2 ++ dlls/wined3d/wined3d_private.h | 14 -------------- include/wine/wined3d.h | 18 ++++++++++++++++++ 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ec77a5661c..4124004198 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2227,11 +2227,13 @@ struct wined3d_shader * CDECL wined3d_device_get_vertex_shader(const struct wine return device->state.shader[WINED3D_SHADER_TYPE_VERTEX]; } -static void wined3d_device_set_constant_buffer(struct wined3d_device *device, +void CDECL wined3d_device_set_constant_buffer(struct wined3d_device *device, enum wined3d_shader_type type, UINT idx, struct wined3d_buffer *buffer) { struct wined3d_buffer *prev; + TRACE("device %p, type %#x, idx %u, buffer %p.\n", device, type, idx, buffer); + if (idx >= MAX_CONSTANT_BUFFERS) { WARN("Invalid constant buffer index %u.\n", idx); @@ -2258,9 +2260,11 @@ void CDECL wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, str wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_VERTEX, idx, buffer); } -static struct wined3d_buffer *wined3d_device_get_constant_buffer(const struct wined3d_device *device, +struct wined3d_buffer * CDECL wined3d_device_get_constant_buffer(const struct wined3d_device *device, enum wined3d_shader_type shader_type, unsigned int idx) { + TRACE("device %p, shader_type %#x, idx %u.\n", device, shader_type, idx); + if (idx >= MAX_CONSTANT_BUFFERS) { WARN("Invalid constant buffer index %u.\n", idx); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index db50a44295..c397f676e3 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -61,6 +61,7 @@ @ cdecl wined3d_device_get_clip_plane(ptr long ptr) @ cdecl wined3d_device_get_clip_status(ptr ptr) @ cdecl wined3d_device_get_compute_shader(ptr) +@ cdecl wined3d_device_get_constant_buffer(ptr long long) @ cdecl wined3d_device_get_creation_parameters(ptr ptr) @ cdecl wined3d_device_get_cs_cb(ptr long) @ cdecl wined3d_device_get_cs_resource_view(ptr long) @@ -137,6 +138,7 @@ @ cdecl wined3d_device_set_clip_plane(ptr long ptr) @ cdecl wined3d_device_set_clip_status(ptr ptr) @ cdecl wined3d_device_set_compute_shader(ptr ptr) +@ cdecl wined3d_device_set_constant_buffer(ptr long long ptr) @ cdecl wined3d_device_set_cs_cb(ptr long ptr) @ cdecl wined3d_device_set_cs_resource_view(ptr long ptr) @ cdecl wined3d_device_set_cs_sampler(ptr long ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f2c4cd669c..c30bb139d3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -926,20 +926,6 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_TABLE_SIZE }; -enum wined3d_shader_type -{ - WINED3D_SHADER_TYPE_PIXEL, - WINED3D_SHADER_TYPE_VERTEX, - WINED3D_SHADER_TYPE_GEOMETRY, - WINED3D_SHADER_TYPE_HULL, - WINED3D_SHADER_TYPE_DOMAIN, - WINED3D_SHADER_TYPE_GRAPHICS_COUNT, - - WINED3D_SHADER_TYPE_COMPUTE = WINED3D_SHADER_TYPE_GRAPHICS_COUNT, - WINED3D_SHADER_TYPE_COUNT, - WINED3D_SHADER_TYPE_INVALID = WINED3D_SHADER_TYPE_COUNT, -}; - struct wined3d_shader_version { enum wined3d_shader_type type; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e15269f3b2..17cc3b8751 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -843,6 +843,20 @@ enum wined3d_shader_byte_code_format WINED3D_SHADER_BYTE_CODE_FORMAT_SM4 = 1, }; +enum wined3d_shader_type +{ + WINED3D_SHADER_TYPE_PIXEL, + WINED3D_SHADER_TYPE_VERTEX, + WINED3D_SHADER_TYPE_GEOMETRY, + WINED3D_SHADER_TYPE_HULL, + WINED3D_SHADER_TYPE_DOMAIN, + WINED3D_SHADER_TYPE_GRAPHICS_COUNT, + + WINED3D_SHADER_TYPE_COMPUTE = WINED3D_SHADER_TYPE_GRAPHICS_COUNT, + WINED3D_SHADER_TYPE_COUNT, + WINED3D_SHADER_TYPE_INVALID = WINED3D_SHADER_TYPE_COUNT, +}; + #define WINED3DCOLORWRITEENABLE_RED (1u << 0) #define WINED3DCOLORWRITEENABLE_GREEN (1u << 1) #define WINED3DCOLORWRITEENABLE_BLUE (1u << 2) @@ -2247,6 +2261,8 @@ HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *devic HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, struct wined3d_clip_status *clip_status); struct wined3d_shader * __cdecl wined3d_device_get_compute_shader(const struct wined3d_device *device); +struct wined3d_buffer * __cdecl wined3d_device_get_constant_buffer(const struct wined3d_device *device, + enum wined3d_shader_type shader_type, unsigned int idx); void __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, struct wined3d_device_creation_parameters *creation_parameters); struct wined3d_buffer * __cdecl wined3d_device_get_cs_cb(const struct wined3d_device *device, unsigned int idx); @@ -2365,6 +2381,8 @@ HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device, HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device, const struct wined3d_clip_status *clip_status); void __cdecl wined3d_device_set_compute_shader(struct wined3d_device *device, struct wined3d_shader *shader); +void __cdecl wined3d_device_set_constant_buffer(struct wined3d_device *device, enum wined3d_shader_type type, UINT idx, + struct wined3d_buffer *buffer); void __cdecl wined3d_device_set_cs_cb(struct wined3d_device *device, unsigned int idx, struct wined3d_buffer *buffer); void __cdecl wined3d_device_set_cs_resource_view(struct wined3d_device *device, unsigned int idx, struct wined3d_shader_resource_view *view); -- 2.14.1

2 11

[PATCH] d3drm/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc May 29, 2018

May 29, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 5bd6e5e285..f78e098fec 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1563,7 +1563,7 @@ static void test_object(void) ok(hr == CLASSFACTORY_E_FIRST, "Expected hr == CLASSFACTORY_E_FIRST, got %#x.\n", hr); ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown); - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { unknown = (IUnknown *)0xdeadbeef; hr = IDirect3DRM_CreateObject(d3drm1, NULL, NULL, tests[i].iid, (void **)&unknown); @@ -3028,7 +3028,7 @@ static void test_d3drm_qi(void) hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); - test_qi("d3drm_qi", (IUnknown *)d3drm, &IID_IDirect3DRM, tests, sizeof(tests) / sizeof(*tests)); + test_qi("d3drm_qi", (IUnknown *)d3drm, &IID_IDirect3DRM, tests, ARRAY_SIZE(tests)); IDirect3DRM_Release(d3drm); } @@ -3122,7 +3122,7 @@ static void test_frame_qi(void) hr = IDirect3DRMFrame_QueryInterface(frame1, &IID_IUnknown, (void **)&unknown); ok(hr == D3DRM_OK, "Failed to create IUnknown from frame1 (hr = %x)\n", hr); IDirect3DRMFrame_Release(frame1); - test_qi("frame1_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + test_qi("frame1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests)); IUnknown_Release(unknown); hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2); @@ -3132,7 +3132,7 @@ static void test_frame_qi(void) hr = IDirect3DRMFrame2_QueryInterface(frame2, &IID_IUnknown, (void **)&unknown); ok(hr == D3DRM_OK, "Failed to create IUnknown from frame2 (hr = %x)\n", hr); IDirect3DRMFrame2_Release(frame2); - test_qi("frame2_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + test_qi("frame2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests)); IUnknown_Release(unknown); hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); @@ -3142,7 +3142,7 @@ static void test_frame_qi(void) hr = IDirect3DRMFrame3_QueryInterface(frame3, &IID_IUnknown, (void **)&unknown); ok(hr == D3DRM_OK, "Failed to create IUnknown from frame3 (hr = %x)\n", hr); IDirect3DRMFrame3_Release(frame3); - test_qi("frame3_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + test_qi("frame3_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests)); IUnknown_Release(unknown); IDirect3DRM3_Release(d3drm3); @@ -3251,7 +3251,7 @@ static void test_device_qi(void) hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IUnknown, (void **)&unknown); ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice (hr = %x)\n", hr); IDirect3DRMDevice_Release(device1); - test_qi("device1_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + test_qi("device1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests)); IUnknown_Release(unknown); hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2); @@ -3261,7 +3261,7 @@ static void test_device_qi(void) hr = IDirect3DRMDevice2_QueryInterface(device2, &IID_IUnknown, (void **)&unknown); ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice2 (hr = %x)\n", hr); IDirect3DRMDevice2_Release(device2); - test_qi("device2_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + test_qi("device2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests)); IUnknown_Release(unknown); hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); @@ -3271,7 +3271,7 @@ static void test_device_qi(void) IDirect3DRMDevice3_QueryInterface(device3, &IID_IUnknown, (void **)&unknown); ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMDevice3 (hr = %x)\n", hr); IDirect3DRMDevice3_Release(device3); - test_qi("device3_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + test_qi("device3_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests)); IUnknown_Release(unknown); IDirectDrawClipper_Release(clipper); @@ -4439,7 +4439,7 @@ static IDirect3DDevice *create_device1(IDirectDraw *ddraw, HWND window, IDirectD /* We used to use EnumDevices() for this, but it seems * D3DDEVICEDESC.dwDeviceZBufferBitDepth only has a very casual * relationship with reality. */ - for (i = 0; i < sizeof(z_depths) / sizeof(*z_depths); ++i) + for (i = 0; i < ARRAY_SIZE(z_depths); ++i) { memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); @@ -4773,7 +4773,7 @@ static IDirect3DDevice2 *create_device2(IDirectDraw2 *ddraw, HWND window, IDirec /* We used to use EnumDevices() for this, but it seems * D3DDEVICEDESC.dwDeviceZBufferBitDepth only has a very casual * relationship with reality. */ - for (i = 0; i < sizeof(z_depths) / sizeof(*z_depths); ++i) + for (i = 0; i < ARRAY_SIZE(z_depths); ++i) { memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); @@ -5596,7 +5596,7 @@ static void test_load_texture(void) hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { filename = create_bitmap(tests[i].w, tests[i].h, tests[i].palettized); @@ -5736,7 +5736,7 @@ static void test_texture_qi(void) hr = IDirect3DRMTexture_QueryInterface(texture1, &IID_IUnknown, (void **)&unknown); ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture (hr = %#x)\n", hr); IDirect3DRMTexture_Release(texture1); - test_qi("texture1_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + test_qi("texture1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests)); IUnknown_Release(unknown); hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2); @@ -5746,7 +5746,7 @@ static void test_texture_qi(void) hr = IDirect3DRMTexture2_QueryInterface(texture2, &IID_IUnknown, (void **)&unknown); ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture2 (hr = %#x)\n", hr); IDirect3DRMTexture2_Release(texture2); - test_qi("texture2_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + test_qi("texture2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests)); IUnknown_Release(unknown); hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); @@ -5757,7 +5757,7 @@ static void test_texture_qi(void) hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IUnknown, (void **)&unknown); ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture3 (hr = %#x)\n", hr); IDirect3DRMTexture3_Release(texture3); - test_qi("texture3_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + test_qi("texture3_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests)); IUnknown_Release(unknown); IDirect3DRM3_Release(d3drm3); @@ -5873,7 +5873,7 @@ static void test_viewport_qi(void) hr = IDirect3DRMViewport_QueryInterface(viewport1, &IID_IUnknown, (void **)&unknown); ok(SUCCEEDED(hr), "Cannot get IUnknown interface (hr = %#x).\n", hr); IDirect3DRMViewport_Release(viewport1); - test_qi("viewport1_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + test_qi("viewport1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests)); IUnknown_Release(unknown); hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2); @@ -5883,7 +5883,7 @@ static void test_viewport_qi(void) hr = IDirect3DRMViewport_QueryInterface(viewport1, &IID_IUnknown, (void **)&unknown); ok(SUCCEEDED(hr), "Cannot get IUnknown interface (hr = %#x).\n", hr); IDirect3DRMViewport_Release(viewport1); - test_qi("viewport1_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + test_qi("viewport1_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests)); IUnknown_Release(unknown); IDirect3DRMDevice_Release(device1); IDirect3DRMFrame_Release(camera1); @@ -5902,7 +5902,7 @@ static void test_viewport_qi(void) hr = IDirect3DRMViewport2_QueryInterface(viewport2, &IID_IUnknown, (void **)&unknown); ok(SUCCEEDED(hr), "Cannot get IUnknown interface (hr = %#x).\n", hr); IDirect3DRMViewport_Release(viewport2); - test_qi("viewport2_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + test_qi("viewport2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests)); IUnknown_Release(unknown); IDirect3DRMDevice3_Release(device3); IDirect3DRMFrame3_Release(camera3); @@ -7181,7 +7181,7 @@ static void test_animation_qi(void) ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#x.\n", hr); IDirect3DRMAnimation_Release(animation); - test_qi("animation_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + test_qi("animation_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests)); IUnknown_Release(unknown); hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); @@ -7194,7 +7194,7 @@ static void test_animation_qi(void) ok(SUCCEEDED(hr), "Failed to get IUnknown from animation, hr %#x.\n", hr); IDirect3DRMAnimation2_Release(animation2); - test_qi("animation2_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + test_qi("animation2_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests)); IUnknown_Release(unknown); IDirect3DRM3_Release(d3drm3); @@ -7302,7 +7302,7 @@ static void test_wrap_qi(void) hr = IDirect3DRMWrap_QueryInterface(wrap, &IID_IUnknown, (void **)&unknown); ok(SUCCEEDED(hr), "Failed to get IUnknown from wrap (hr = %#x)\n", hr); IDirect3DRMWrap_Release(wrap); - test_qi("wrap_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + test_qi("wrap_qi", unknown, &IID_IUnknown, tests, ARRAY_SIZE(tests)); IUnknown_Release(unknown); IDirect3DRM_Release(d3drm1); -- 2.14.3

2 1

[PATCH] d3d10/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc May 29, 2018

May 29, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d10/tests/device.c | 2 +- dlls/d3d10/tests/effect.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index 3e2731d895..d5ba0c1818 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -154,7 +154,7 @@ static void test_stateblock_mask(void) ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); hr = D3D10StateBlockMaskEnableCapture(NULL, D3D10_DST_VS, 0, 1); ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); - for (i = 0; i < sizeof(capture_test) / sizeof(*capture_test); ++i) + for (i = 0; i < ARRAY_SIZE(capture_test); ++i) { memset(&result, 0xff, sizeof(result)); hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS_SHADER_RESOURCES, diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 28ff4b7387..0ca7a48c3f 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -2425,7 +2425,7 @@ static void test_effect_constant_buffer_stride(void) hr = create_effect(fx_test_ecbs, 0, device, NULL, &effect); ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); - for (i=0; i<sizeof(tv_ecbs)/sizeof(tv_ecbs[0]); i++) + for (i=0; i<ARRAY_SIZE(tv_ecbs); i++) { constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, i); type = constantbuffer->lpVtbl->GetType(constantbuffer); -- 2.14.3

2 1