June 2019 - Wine-Commits - list.winehq.org

André Hentschel : setupapi/tests: Don' t test functions directly when reporting GetLastError().
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: wine Branch: master Commit: dae160ceda33598632597527cb56090acf58f60d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dae160ceda33598632597527… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 9 18:17:20 2019 +0200 setupapi/tests: Don't test functions directly when reporting GetLastError(). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index f266592..430dede 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -200,7 +200,8 @@ static void test_install_class(void) ret = SetupDiInstallClassA(NULL, tmpfile, 0, NULL); ok(ret, "Failed to install class, error %#x.\n", GetLastError()); - ok(!RegDeleteKeyW(HKEY_LOCAL_MACHINE, classKey), "Failed to delete class key, error %u.\n", GetLastError()); + ret = RegDeleteKeyW(HKEY_LOCAL_MACHINE, classKey); + ok(!ret, "Failed to delete class key, error %u.\n", GetLastError()); DeleteFileA(tmpfile); }

1 0

Nikolay Sivov : mfplat: Make sure async event delivery is triggered with EndGetEvent().
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: wine Branch: master Commit: 67bd377af2389ecc1473f01c702a3fd264b8cf0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=67bd377af2389ecc1473f01c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 7 16:09:01 2019 +0300 mfplat: Make sure async event delivery is triggered with EndGetEvent(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 460f21e..224ba6e 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5982,6 +5982,7 @@ struct event_queue CONDITION_VARIABLE update_event; struct list events; BOOL is_shut_down; + BOOL notified; IMFAsyncResult *subscriber; }; @@ -6105,9 +6106,10 @@ static HRESULT WINAPI eventqueue_GetEvent(IMFMediaEventQueue *iface, DWORD flags static void queue_notify_subscriber(struct event_queue *queue) { - if (list_empty(&queue->events) || !queue->subscriber) + if (list_empty(&queue->events) || !queue->subscriber || queue->notified) return; + queue->notified = TRUE; MFPutWorkItemEx(MFASYNC_CALLBACK_QUEUE_STANDARD, queue->subscriber); } @@ -6163,6 +6165,7 @@ static HRESULT WINAPI eventqueue_EndGetEvent(IMFMediaEventQueue *iface, IMFAsync if (queue->subscriber) IMFAsyncResult_Release(queue->subscriber); queue->subscriber = NULL; + queue->notified = FALSE; hr = *event ? S_OK : E_FAIL; }

1 0

Nikolay Sivov : mf: Add support for MEStreamSinkMarker event for sample grabber.
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: wine Branch: master Commit: f525251226e92f76748dd1b6e51335245d71479a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f525251226e92f76748dd1b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 7 16:08:59 2019 +0300 mf: Add support for MEStreamSinkMarker event for sample grabber. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 2 +- dlls/mf/samplegrabber.c | 163 ++++++++++++++++++++++++++++++++++++------------ 2 files changed, 124 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f525251226e92f76748d…

1 0

Nikolay Sivov : mf: Raise sample request events for sample grabber stream.
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: wine Branch: master Commit: 5371d6b82b84c01fd2237bbc19dc8505cd6cf004 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5371d6b82b84c01fd2237bbc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 7 16:08:58 2019 +0300 mf: Raise sample request events for sample grabber stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 3f96444..23bfa06 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -613,6 +613,11 @@ static struct scheduled_sample *stream_get_next_sample(struct sample_grabber_str return sample; } +static void sample_grabber_stream_request_sample(struct sample_grabber_stream *stream) +{ + IMFStreamSink_QueueEvent(&stream->IMFStreamSink_iface, MEStreamSinkRequestSample, &GUID_NULL, S_OK, NULL); +} + static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct sample_grabber_stream *stream = impl_from_IMFAsyncCallback(iface); @@ -634,6 +639,7 @@ static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallba if (FAILED(hr = stream_schedule_sample(stream, sample))) WARN("Failed to schedule a sample, hr %#x.\n", hr); } + sample_grabber_stream_request_sample(stream); } LeaveCriticalSection(&stream->cs); @@ -950,6 +956,7 @@ static void sample_grabber_set_state(struct sample_grabber *grabber, enum sink_s MEStreamSinkStarted, /* SINK_STATE_RUNNING */ }; BOOL set_state = FALSE; + unsigned int i; EnterCriticalSection(&grabber->cs); @@ -970,6 +977,12 @@ static void sample_grabber_set_state(struct sample_grabber *grabber, enum sink_s if (set_state) { grabber->stream->state = state; + if (state == SINK_STATE_RUNNING) + { + /* Every transition to running state sends a bunch requests to build up initial queue. */ + for (i = 0; i < 4; ++i) + sample_grabber_stream_request_sample(grabber->stream); + } IMFStreamSink_QueueEvent(&grabber->stream->IMFStreamSink_iface, events[state], &GUID_NULL, S_OK, NULL); } }

1 0

Alexandre Julliard : mciwave: Build with msvcrt.
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: wine Branch: master Commit: f33a33700d7fd979e087a5b9aea112c926d1002e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f33a33700d7fd979e087a5b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:58:58 2019 +0200 mciwave: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciwave/Makefile.in | 2 ++ dlls/mciwave/mciwave.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mciwave/Makefile.in b/dlls/mciwave/Makefile.in index 7df9538..b96726d 100644 --- a/dlls/mciwave/Makefile.in +++ b/dlls/mciwave/Makefile.in @@ -1,5 +1,7 @@ MODULE = mciwave.dll IMPORTS = winmm user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mciwave.c diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 0fa9b20..78f26c2 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -32,7 +32,6 @@ #include "wownt32.h" #include "digitalv.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mciwave); @@ -466,7 +465,7 @@ static LRESULT WAVE_mciOpenFile(WINE_MCIWAVE* wmw, LPCWSTR filename) fn = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(filename) + 1) * sizeof(WCHAR)); if (!fn) return MCIERR_OUT_OF_MEMORY; - strcpyW(fn, filename); + lstrcpyW(fn, filename); HeapFree(GetProcessHeap(), 0, wmw->lpFileName); wmw->lpFileName = fn;

1 0

Alexandre Julliard : mcicda: Build with msvcrt.
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: wine Branch: master Commit: 5007d260275055cc4592d7a7e6d92381fc8a966c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5007d260275055cc4592d7a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:58:17 2019 +0200 mcicda: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mcicda/Makefile.in | 2 ++ dlls/mcicda/mcicda.c | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mcicda/Makefile.in b/dlls/mcicda/Makefile.in index fad0689..9bfee00 100644 --- a/dlls/mcicda/Makefile.in +++ b/dlls/mcicda/Makefile.in @@ -1,5 +1,7 @@ MODULE = mcicda.dll IMPORTS = winmm user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mcicda.c diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 18881ef..e23ba5a 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include <stdio.h> #include <string.h> @@ -36,7 +35,6 @@ #include "ntddcdrm.h" #include "winternl.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "dsound.h" WINE_DEFAULT_DEBUG_CHANNEL(mcicda); @@ -683,7 +681,7 @@ static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) } res = CDROM_Audio_GetSerial(&toc); - sprintfW(buffer, wszLu, res); + swprintf(buffer, ARRAY_SIZE(buffer), wszLu, res); str = buffer; } else { WARN("Don't know this info command (%u)\n", dwFlags);

1 0

Alexandre Julliard : mapistub: Build with msvcrt.
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: wine Branch: master Commit: 1b9706ef9b7254837d53b7e93c85d115fb186c28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b9706ef9b7254837d53b7e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:57:44 2019 +0200 mapistub: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mapistub/Makefile.in | 2 ++ dlls/mapistub/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mapistub/Makefile.in b/dlls/mapistub/Makefile.in index 93671ae..63e06a4 100644 --- a/dlls/mapistub/Makefile.in +++ b/dlls/mapistub/Makefile.in @@ -1,4 +1,6 @@ MODULE = mapistub.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/mapistub/main.c b/dlls/mapistub/main.c index 51ff43b..d1d8117 100644 --- a/dlls/mapistub/main.c +++ b/dlls/mapistub/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : lzexpand: Build with msvcrt.
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: wine Branch: master Commit: e62ef2709f01924cb61d6a2c52f422875704490f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e62ef2709f01924cb61d6a2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 10:56:16 2019 +0200 lzexpand: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/lzexpand.dll16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/lzexpand.dll16/Makefile.in b/dlls/lzexpand.dll16/Makefile.in index b44a1eb..0269e46 100644 --- a/dlls/lzexpand.dll16/Makefile.in +++ b/dlls/lzexpand.dll16/Makefile.in @@ -1,5 +1,5 @@ MODULE = lzexpand.dll16 IMPORTS = lz32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,lz32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,lz32.dll C_SRCS = lzexpand.c

1 0

Nikolay Sivov : mfplat: Add MFRegisterLocalSchemeHandler().
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: wine Branch: master Commit: a52c7aff73b9f4c0a009c2a662475717cd050c8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a52c7aff73b9f4c0a009c2a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 7 16:09:02 2019 +0300 mfplat: Add MFRegisterLocalSchemeHandler(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 41 +++++++ dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 274 +++++++++++++++++++++++++++++++++++++++++++++ include/mfapi.h | 2 + 4 files changed, 318 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a52c7aff73b9f4c0a009…

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_bind_dummy_textures().
by Alexandre Julliard June 10, 2019

June 10, 2019

Module: wine Branch: master Commit: 813e08fc1da223cdb20058f3c7b6d8d0bd2befe3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=813e08fc1da223cdb20058f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 7 17:40:29 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_bind_dummy_textures(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 8 ++++---- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1f187f3..18a516c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1759,10 +1759,10 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC } /* Context activation is done by the caller. */ -void context_bind_dummy_textures(const struct wined3d_context *context) +void wined3d_context_gl_bind_dummy_textures(const struct wined3d_context_gl *context_gl) { - const struct wined3d_dummy_textures *textures = &wined3d_device_gl(context->device)->dummy_textures; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_dummy_textures *textures = &wined3d_device_gl(context_gl->c.device)->dummy_textures; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; unsigned int i; for (i = 0; i < gl_info->limits.combined_samplers; ++i) @@ -2279,7 +2279,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi * are not created yet. In that case, they will be created (and bound) by * create_dummy_textures right after this context is initialized. */ if (wined3d_device_gl(device)->dummy_textures.tex_2d) - context_bind_dummy_textures(context); + wined3d_context_gl_bind_dummy_textures(context_gl); /* Initialise all rectangles to avoid resetting unused ones later. */ gl_info->gl_ops.gl.p_glScissor(0, 0, 0, 0); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4ec4022..3acaee6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -803,7 +803,7 @@ static void wined3d_device_gl_create_dummy_textures(struct wined3d_device_gl *de checkGLcall("create dummy textures"); - context_bind_dummy_textures(&context_gl->c); + wined3d_context_gl_bind_dummy_textures(context_gl); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6402ec1..9462358 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2082,6 +2082,7 @@ void wined3d_context_gl_apply_fbo_state_blit(struct wined3d_context_gl *context_ void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_gl, const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_context_gl_bind_bo(struct wined3d_context_gl *context_gl, GLenum binding, GLuint name) DECLSPEC_HIDDEN; +void wined3d_context_gl_bind_dummy_textures(const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLenum target, GLuint name) DECLSPEC_HIDDEN; void wined3d_context_gl_check_fbo_status(const struct wined3d_context_gl *context_gl, GLenum target) DECLSPEC_HIDDEN; @@ -2238,7 +2239,6 @@ void wined3d_raw_blitter_create(struct wined3d_blitter **next, BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN; -void context_bind_dummy_textures(const struct wined3d_context *context) DECLSPEC_HIDDEN; void context_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, GLenum dst_binding, const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN;

1 0