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

Nikolay Sivov : mf: Implement file scheme handler.
by Alexandre Julliard May 3, 2019

May 3, 2019

Module: wine Branch: master Commit: 8c69a77032ff8d5f0a79c387646f40716d9393ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c69a77032ff8d5f0a79c387… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 3 14:53:00 2019 +0300 mf: Implement file scheme handler. 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/main.c | 381 ++++++++++++++++++++++++++++++++++++++++++++- dlls/mfplat/tests/mfplat.c | 27 ++-- 3 files changed, 385 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8c69a77032ff8d5f0a79…

1 0

Alexandre Julliard : cmd: Build with msvcrt.
by Alexandre Julliard May 3, 2019

May 3, 2019

Module: wine Branch: master Commit: 43c430a6d837d99f30dbcdb770f676e60ddb1ffb URL: https://source.winehq.org/git/wine.git/?a=commit;h=43c430a6d837d99f30dbcdb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 12:28:33 2019 +0200 cmd: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/Makefile.in | 3 +- programs/cmd/batch.c | 94 +++++------ programs/cmd/builtins.c | 422 +++++++++++++++++++++++------------------------ programs/cmd/directory.c | 80 ++++----- programs/cmd/wcmd.h | 6 +- programs/cmd/wcmdmain.c | 202 +++++++++++------------ 6 files changed, 403 insertions(+), 404 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43c430a6d837d99f30db…

1 0

Henri Verbeet : wined3d: Rename context_destroy_gl_resources() to wined3d_context_cleanup().
by Alexandre Julliard May 3, 2019

May 3, 2019

Module: wine Branch: master Commit: 08b8801c3c0cf99665ad0120b3b127fa220336c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08b8801c3c0cf99665ad0120… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 3 15:43:59 2019 +0430 wined3d: Rename context_destroy_gl_resources() to wined3d_context_cleanup(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5978627..3f9605c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1312,7 +1312,7 @@ static void context_update_window(struct wined3d_context *context) } } -static void context_destroy_gl_resources(struct wined3d_context *context) +static void wined3d_context_cleanup(struct wined3d_context *context) { struct wined3d_pipeline_statistics_query *pipeline_statistics_query; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -1510,7 +1510,7 @@ BOOL context_set_current(struct wined3d_context *ctx) if (old->destroyed) { TRACE("Switching away from destroyed context %p.\n", old); - context_destroy_gl_resources(old); + wined3d_context_cleanup(old); heap_free((void *)old->gl_info); heap_free(old); } @@ -2328,7 +2328,7 @@ void wined3d_context_destroy(struct wined3d_context *context) { struct wined3d_gl_info *gl_info; - /* Make a copy of gl_info for context_destroy_gl_resources() use, the + /* Make a copy of gl_info for wined3d_context_cleanup() use, the * one in wined3d_adapter may go away in the meantime. */ gl_info = heap_alloc(sizeof(*gl_info)); *gl_info = *context->gl_info; @@ -2338,7 +2338,7 @@ void wined3d_context_destroy(struct wined3d_context *context) return; } - context_destroy_gl_resources(context); + wined3d_context_cleanup(context); TlsSetValue(wined3d_context_tls_idx, NULL); heap_free(context); }

1 0

Henri Verbeet : wined3d: Free shader backend and fragment pipe context data in device_context_remove ().
by Alexandre Julliard May 3, 2019

May 3, 2019

Module: wine Branch: master Commit: a9dca944cb6f54afc1a5e7f9ee283cfab808816e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9dca944cb6f54afc1a5e7f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 3 15:44:02 2019 +0430 wined3d: Free shader backend and fragment pipe context data in device_context_remove(). 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/device.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b239813..4a73cbb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2347,8 +2347,6 @@ void wined3d_context_destroy(struct wined3d_context *context) return; } - device->shader_backend->shader_free_context_data(context); - device->adapter->fragment_pipe->free_context_data(context); device_context_remove(device, context); wined3d_context_gl_destroy(wined3d_context_gl(context)); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e25565d..df491e1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -168,6 +168,9 @@ void device_context_remove(struct wined3d_device *device, struct wined3d_context TRACE("Removing context %p.\n", context); + device->adapter->fragment_pipe->free_context_data(context); + device->shader_backend->shader_free_context_data(context); + for (i = 0; i < device->context_count; ++i) { if (device->contexts[i] == context)

1 0

Henri Verbeet : wined3d: Allocate shader backend and fragment pipe context data in device_context_add ().
by Alexandre Julliard May 3, 2019

May 3, 2019

Module: wine Branch: master Commit: ef3df93f465e302f841150b6382f5ff4e4870c04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef3df93f465e302f841150b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 3 15:44:03 2019 +0430 wined3d: Allocate shader backend and fragment pipe context data in device_context_add(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 39 ++++++++------------------------------- dlls/wined3d/device.c | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4a73cbb..7e7ab09 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1925,19 +1925,6 @@ static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d list_init(&context->fbo_list); list_init(&context->fbo_destroy_list); - if (!device->shader_backend->shader_allocate_context_data(context)) - { - ERR("Failed to allocate shader backend context data.\n"); - return FALSE; - } - - if (!device->adapter->fragment_pipe->allocate_context_data(context)) - { - ERR("Failed to allocate fragment pipeline context data.\n"); - device->shader_backend->shader_free_context_data(context); - return FALSE; - } - if (!(context->hdc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) { WARN("Failed to retrieve device context, trying swapchain backup.\n"); @@ -1945,8 +1932,6 @@ static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d if (!(context->hdc = swapchain_get_backup_dc(swapchain))) { ERR("Failed to retrieve a device context.\n"); - device->shader_backend->shader_free_context_data(context); - device->adapter->fragment_pipe->free_context_data(context); return FALSE; } context->hdc_is_private = TRUE; @@ -2001,31 +1986,23 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, heap_free(context_gl); return NULL; } - - if (!device_context_add(device, context)) + if (!(device->adapter->adapter_ops->adapter_create_context(context, target, ds_format))) { - ERR("Failed to add the newly created context to the context list\n"); - goto fail; + wined3d_release_dc(context->win_handle, context->hdc); + heap_free(context_gl); + return NULL; } - if (!(device->adapter->adapter_ops->adapter_create_context(context, target, ds_format))) + if (!device_context_add(device, context)) { - device_context_remove(device, context); - goto fail; + ERR("Failed to add the newly created context to the context list\n"); + wined3d_context_gl_destroy(context_gl); + return NULL; } - device->shader_backend->shader_init_context_state(context); - TRACE("Created context %p.\n", context); return context; - -fail: - wined3d_release_dc(context->win_handle, context->hdc); - device->shader_backend->shader_free_context_data(context); - device->adapter->fragment_pipe->free_context_data(context); - heap_free(context_gl); - return NULL; } BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index df491e1..a27251c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -149,14 +149,31 @@ BOOL device_context_add(struct wined3d_device *device, struct wined3d_context *c TRACE("Adding context %p.\n", context); + if (!device->shader_backend->shader_allocate_context_data(context)) + { + ERR("Failed to allocate shader backend context data.\n"); + return FALSE; + } + device->shader_backend->shader_init_context_state(context); + + if (!device->adapter->fragment_pipe->allocate_context_data(context)) + { + ERR("Failed to allocate fragment pipeline context data.\n"); + device->shader_backend->shader_free_context_data(context); + return FALSE; + } + if (!(new_array = heap_realloc(device->contexts, sizeof(*new_array) * (device->context_count + 1)))) { ERR("Failed to grow the context array.\n"); + device->adapter->fragment_pipe->free_context_data(context); + device->shader_backend->shader_free_context_data(context); return FALSE; } new_array[device->context_count++] = context; device->contexts = new_array; + return TRUE; }

1 0

Piotr Caban : winebus.sys: Add more traces on hidraw communication errors.
by Alexandre Julliard May 3, 2019

May 3, 2019

Module: wine Branch: master Commit: 926797383536df797fb8f7e8643a5805559ab539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=926797383536df797fb8f7e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 11:57:52 2019 +0200 winebus.sys: Add more traces on hidraw communication errors. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 99753d6..e8e837a 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -765,7 +765,7 @@ static DWORD CALLBACK device_report_thread(void *args) break; size = read(plfds[0].fd, report_buffer, sizeof(report_buffer)); if (size == -1) - TRACE_(hid_report)("Read failed. Likely an unplugged device\n"); + TRACE_(hid_report)("Read failed. Likely an unplugged device %d %s\n", errno, strerror(errno)); else if (size == 0) TRACE_(hid_report)("Failed to read report\n"); else @@ -827,6 +827,7 @@ static NTSTATUS hidraw_set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE * } else { + TRACE("write failed: %d %d %s\n", rc, errno, strerror(errno)); *written = 0; return STATUS_UNSUCCESSFUL; } @@ -847,6 +848,7 @@ static NTSTATUS hidraw_get_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE } else { + TRACE_(hid_report)("ioctl(HIDIOCGFEATURE(%d)) failed: %d %s\n", length, errno, strerror(errno)); *read = 0; return STATUS_UNSUCCESSFUL; } @@ -887,6 +889,7 @@ static NTSTATUS hidraw_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE } else { + TRACE_(hid_report)("ioctl(HIDIOCSFEATURE(%d)) failed: %d %s\n", length, errno, strerror(errno)); *written = 0; return STATUS_UNSUCCESSFUL; }

1 0

Alexandre Julliard : explorer: Move screen saver activation to the X11 driver.
by Alexandre Julliard May 3, 2019

May 3, 2019

Module: wine Branch: master Commit: ed22f0454bc50f7820fc93fbe8c2af4877083006 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed22f0454bc50f7820fc93fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 12:28:38 2019 +0200 explorer: Move screen saver activation to the X11 driver. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 26 +++++++++++++++++++++++++- programs/explorer/desktop.c | 22 ++-------------------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 97dee52..fb97ec5 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include <stdarg.h> #include <stdlib.h> @@ -2764,6 +2765,25 @@ static BOOL is_netwm_supported( Display *display, Atom atom ) /*********************************************************************** + * start_screensaver + */ +static LRESULT start_screensaver(void) +{ + if (root_window == DefaultRootWindow(gdi_display)) + { + const char *argv[3] = { "xdg-screensaver", "activate", NULL }; + int pid = _spawnvp( _P_DETACH, argv[0], argv ); + if (pid > 0) + { + TRACE( "started process %d\n", pid ); + return 0; + } + } + return -1; +} + + +/*********************************************************************** * SysCommand (X11DRV.@) * * Perform WM_SYSCOMMAND handling. @@ -2774,7 +2794,11 @@ LRESULT CDECL X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) int dir; struct x11drv_win_data *data; - if (!(data = get_win_data( hwnd ))) return -1; + if (!(data = get_win_data( hwnd ))) + { + if (wparam == SC_SCREENSAVE && hwnd == GetDesktopWindow()) return start_screensaver(); + return -1; + } if (!data->whole_window || !data->managed || !data->mapped) goto failed; switch (wparam & 0xfff0) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 27b9b24..f4cc7b1 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -583,22 +583,6 @@ static void initialize_launchers( HWND hwnd ) } } -/* screen saver handler */ -static BOOL start_screensaver( void ) -{ - if (using_root) - { - const char *argv[3] = { "xdg-screensaver", "activate", NULL }; - int pid = _spawnvp( _P_DETACH, argv[0], argv ); - if (pid > 0) - { - WINE_TRACE( "started process %d\n", pid ); - return TRUE; - } - } - return FALSE; -} - static WNDPROC desktop_orig_wndproc; /* window procedure for the desktop window */ @@ -613,11 +597,9 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR { case SC_CLOSE: ExitWindows( 0, 0 ); - break; - case SC_SCREENSAVE: - return start_screensaver(); + return 0; } - return 0; + break; case WM_CLOSE: PostQuitMessage(0);

1 0

Jacek Caban : server: Don' t use IRP_MJ_* constants for ntoskrnl.exe communication.
by Alexandre Julliard May 3, 2019

May 3, 2019

Module: wine Branch: master Commit: b1e1111d7b0840615eb4516462eda1cc985109dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1e1111d7b0840615eb45164… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 3 15:40:05 2019 +0200 server: Don't use IRP_MJ_* constants for ntoskrnl.exe communication. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 59 ++++++++++++------------------------------ include/wine/server_protocol.h | 32 ++++++++++++++++------- server/device.c | 44 ++++++++++++++++--------------- server/protocol.def | 30 ++++++++++++++------- server/trace.c | 38 ++++++++++++++------------- 5 files changed, 102 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b1e1111d7b0840615eb4…

1 0

Michael Stefaniuc : riched32/tests: Test the correct return value.
by Alexandre Julliard May 3, 2019

May 3, 2019

Module: wine Branch: master Commit: 4b3b27a7f139471d8f479b5702c6a0a8993d8d57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b3b27a7f139471d8f479b57… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 3 15:19:51 2019 +0200 riched32/tests: Test the correct return value. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/tests/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 7394203..0d55b7c 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -1263,8 +1263,8 @@ static void test_enter(void) SendMessageW(hwndRichEdit, WM_CHAR, 'T', 0); SendMessageW(hwndRichEdit, WM_CHAR, '\r', 0); - SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); - ok(result == 1, "Got %d\n", (int)result); + result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); + ok(result == 3, "Got %ld\n", result); format_test_result(resultbuf, buf); format_test_result(expectedbuf, "T\r\n"); result = strcmp(resultbuf, expectedbuf);

1 0

Nikolay Sivov : wmvcore: Return success from OpenStream().
by Alexandre Julliard May 3, 2019

May 3, 2019

Module: wine Branch: master Commit: 054f95e6599f93adf7bc45b65e74f2e24b5b96c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=054f95e6599f93adf7bc45b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 3 14:53:32 2019 +0300 wmvcore: Return success from OpenStream(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmvcore/reader.c b/dlls/wmvcore/reader.c index d35f29d..6041c56 100644 --- a/dlls/wmvcore/reader.c +++ b/dlls/wmvcore/reader.c @@ -2222,7 +2222,7 @@ static HRESULT WINAPI WMSyncReader_OpenStream(IWMSyncReader *iface, IStream *str { WMSyncReader *This = impl_from_IWMSyncReader(iface); FIXME("(%p)->(%p): stub!\n", This, stream); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI WMSyncReader_SetOutputProps(IWMSyncReader *iface, DWORD output_num, IWMOutputMediaProps *output)

1 0