August 2019 - Wine-commits - list.winehq.org

Richard Pospesel : widl: Refactor to have pointer type' s ref use decl_spec_t rather than type_t.
by Alexandre Julliard 13 Aug '19

13 Aug '19

Module: wine Branch: master Commit: 76512154f819b489ae5f5eaa1eba5037ec40765c URL: https://source.winehq.org/git/wine.git/?a=commit;h=76512154f819b489ae5f5eaa… Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Jul 5 14:51:32 2019 -0700 widl: Refactor to have pointer type's ref use decl_spec_t rather than type_t. Signed-off-by: Richard Pospesel <richard(a)torproject.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/expr.c | 2 +- tools/widl/header.c | 20 +++++++++--------- tools/widl/header.h | 4 ++-- tools/widl/parser.y | 28 ++++++++++++------------- tools/widl/proxy.c | 4 ++-- tools/widl/typegen.c | 54 ++++++++++++++++++++++++------------------------- tools/widl/typelib.c | 2 +- tools/widl/typetree.c | 2 +- tools/widl/typetree.h | 9 +++++++-- tools/widl/widltypes.h | 3 +-- tools/widl/write_msft.c | 10 ++++----- 11 files changed, 71 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=76512154f819b489ae5f…

1 0

Richard Pospesel : widl: Bump MIDL version to 5.2.202 to avoid RPC_X_WRONG_STUB_VERSION exception in ObjectStublessClient.
by Alexandre Julliard 13 Aug '19

13 Aug '19

Module: wine Branch: master Commit: 1f5942303907c1932c1e385b6d2b9f453a537105 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f5942303907c1932c1e385b… Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Jul 5 14:51:44 2019 -0700 widl: Bump MIDL version to 5.2.202 to avoid RPC_X_WRONG_STUB_VERSION exception in ObjectStublessClient. Signed-off-by: Richard Pospesel <richard(a)torproject.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/client.c | 4 ++-- tools/widl/proxy.c | 2 +- tools/widl/server.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index b0a5d0c..0ab2fc6 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -20,7 +20,7 @@ #include "config.h" #include "wine/port.h" - + #include <stdio.h> #include <stdlib.h> #ifdef HAVE_UNISTD_H @@ -425,7 +425,7 @@ static void write_stubdescriptor(type_t *iface, int expr_eval_routines) print_client("1, /* -error bounds_check flag */\n"); print_client("0x%x, /* Ndr library version */\n", get_stub_mode() == MODE_Oif ? 0x50002 : 0x10001); print_client("0,\n"); - print_client("0x50100a4, /* MIDL Version 5.1.164 */\n"); + print_client("0x50200ca, /* MIDL Version 5.2.202 */\n"); print_client("0,\n"); print_client("%s,\n", list_empty(&user_type_list) ? "0" : "UserMarshalRoutines"); print_client("0, /* notify & notify_flag routine table */\n"); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 8f65e8a..45e2582 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -67,7 +67,7 @@ static void write_stubdesc(int expr_eval_routines) print_proxy( "1, /* -error bounds_check flag */\n"); print_proxy( "0x%x, /* Ndr library version */\n", get_stub_mode() == MODE_Oif ? 0x50002 : 0x10001); print_proxy( "0,\n"); - print_proxy( "0x50100a4, /* MIDL Version 5.1.164 */\n"); + print_proxy( "0x50200ca, /* MIDL Version 5.2.202 */\n"); print_proxy( "0,\n"); print_proxy("%s,\n", list_empty(&user_type_list) ? "0" : "UserMarshalRoutines"); print_proxy( "0, /* notify & notify_flag routine table */\n"); diff --git a/tools/widl/server.c b/tools/widl/server.c index fb14dd8..156cd3c 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -386,7 +386,7 @@ static void write_stubdescriptor(type_t *iface, int expr_eval_routines) print_server("1, /* -error bounds_check flag */\n"); print_server("0x%x, /* Ndr library version */\n", get_stub_mode() == MODE_Oif ? 0x50002 : 0x10001); print_server("0,\n"); - print_server("0x50100a4, /* MIDL Version 5.1.164 */\n"); + print_server("0x50200ca, /* MIDL Version 5.2.202 */\n"); print_server("0,\n"); print_server("%s,\n", list_empty(&user_type_list) ? "0" : "UserMarshalRoutines"); print_server("0, /* notify & notify_flag routine table */\n");

1 0

Alistair Leslie-Hughes : include: Define ADDRINFOT explicitly.
by Alexandre Julliard 13 Aug '19

13 Aug '19

Module: wine Branch: master Commit: 719cc347b4db07b3f0c1cab53dfa5ea0a567f366 URL: https://source.winehq.org/git/wine.git/?a=commit;h=719cc347b4db07b3f0c1cab5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 12 23:24:14 2019 +0000 include: Define ADDRINFOT explicitly. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2tcpip.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index b26ab2f..43c277f 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -54,8 +54,9 @@ typedef struct WS(addrinfoW) struct WS(addrinfoW)* ai_next; } ADDRINFOW, *PADDRINFOW; -DECL_WINELIB_TYPE_AW(ADDRINFOT) -DECL_WINELIB_TYPE_AW(PADDRINFOT) +#ifndef WINE_NO_UNICODE_MACROS +typedef WINELIB_NAME_AW(ADDRINFO) ADDRINFOT, *PADDRINFOT; +#endif #ifdef USE_WS_PREFIX typedef int WS_socklen_t;

1 0

Alistair Leslie-Hughes : include: Add IDebugClient2-7 interfaces.
by Alexandre Julliard 13 Aug '19

13 Aug '19

Module: wine Branch: master Commit: 27890cfbaa32f518bdc003f3e6d66d0639c0ef15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27890cfbaa32f518bdc003f3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 13 00:21:10 2019 +0000 include: Add IDebugClient2-7 interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbgeng.h | 714 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 714 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=27890cfbaa32f518bdc0…

1 0

Henri Verbeet : wined3d: Make the adapter responsible for texture creation and destruction.
by Alexandre Julliard 13 Aug '19

13 Aug '19

Module: wine Branch: master Commit: e3e9bdeedbf380fbd264fec73c6dabff58a9c027 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3e9bdeedbf380fbd264fec7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 13 13:19:36 2019 +0430 wined3d: Make the adapter responsible for texture creation and destruction. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 86 +++++++++++ dlls/wined3d/adapter_vk.c | 54 +++++++ dlls/wined3d/directx.c | 53 +++++++ dlls/wined3d/texture.c | 336 ++++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 38 +++++ 5 files changed, 425 insertions(+), 142 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e3e9bdeedbf380fbd264…

1 0

Henri Verbeet : wined3d: Introduce a separate structure for OpenGL swapchain information.
by Alexandre Julliard 13 Aug '19

13 Aug '19

Module: wine Branch: master Commit: eef96e89ac021116e0ae352bef3698773bf5906a URL: https://source.winehq.org/git/wine.git/?a=commit;h=eef96e89ac021116e0ae352b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 13 13:19:37 2019 +0430 wined3d: Introduce a separate structure for OpenGL swapchain information. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 10 ++++++---- dlls/wined3d/swapchain.c | 9 +++++++-- dlls/wined3d/wined3d_private.h | 13 ++++++++++++- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index cf54468..cf5cb0e 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4656,7 +4656,7 @@ static void adapter_gl_uninit_3d(struct wined3d_device *device) static HRESULT adapter_gl_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain) { - struct wined3d_swapchain *swapchain_gl; + struct wined3d_swapchain_gl *swapchain_gl; HRESULT hr; TRACE("device %p, desc %p, parent %p, parent_ops %p, swapchain %p.\n", @@ -4673,15 +4673,17 @@ static HRESULT adapter_gl_create_swapchain(struct wined3d_device *device, struct } TRACE("Created swapchain %p.\n", swapchain_gl); - *swapchain = swapchain_gl; + *swapchain = &swapchain_gl->s; return hr; } static void adapter_gl_destroy_swapchain(struct wined3d_swapchain *swapchain) { - wined3d_swapchain_cleanup(swapchain); - heap_free(swapchain); + struct wined3d_swapchain_gl *swapchain_gl = wined3d_swapchain_gl(swapchain); + + wined3d_swapchain_gl_cleanup(swapchain_gl); + heap_free(swapchain_gl); } static HRESULT adapter_gl_create_buffer(struct wined3d_device *device, diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 4d277c7..c0eeca5 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -105,6 +105,11 @@ void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) } } +void wined3d_swapchain_gl_cleanup(struct wined3d_swapchain_gl *swapchain_gl) +{ + wined3d_swapchain_cleanup(&swapchain_gl->s); +} + ULONG CDECL wined3d_swapchain_incref(struct wined3d_swapchain *swapchain) { ULONG refcount = InterlockedIncrement(&swapchain->ref); @@ -1031,13 +1036,13 @@ HRESULT wined3d_swapchain_no3d_init(struct wined3d_swapchain *swapchain_no3d, st return wined3d_swapchain_init(swapchain_no3d, device, desc, parent, parent_ops, &swapchain_no3d_ops); } -HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain *swapchain_gl, struct wined3d_device *device, +HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { TRACE("swapchain_gl %p, device %p, desc %p, parent %p, parent_ops %p.\n", swapchain_gl, device, desc, parent, parent_ops); - return wined3d_swapchain_init(swapchain_gl, device, desc, parent, parent_ops, &swapchain_gl_ops); + return wined3d_swapchain_init(&swapchain_gl->s, device, desc, parent, parent_ops, &swapchain_gl_ops); } HRESULT wined3d_swapchain_vk_init(struct wined3d_swapchain *swapchain_vk, struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e81d72b..1e4e139 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4422,7 +4422,18 @@ HRESULT wined3d_swapchain_no3d_init(struct wined3d_swapchain *swapchain_no3d, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain *swapchain_gl, +struct wined3d_swapchain_gl +{ + struct wined3d_swapchain s; +}; + +static inline struct wined3d_swapchain_gl *wined3d_swapchain_gl(struct wined3d_swapchain *swapchain) +{ + return CONTAINING_RECORD(swapchain, struct wined3d_swapchain_gl, s); +} + +void wined3d_swapchain_gl_cleanup(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; +HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Move the backup window from struct wined3d_swapchain to struct wined3d_swapchain_gl.
by Alexandre Julliard 13 Aug '19

13 Aug '19

Module: wine Branch: master Commit: 17ce10076613f9f788fb70df335c33e29fb6bc26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17ce10076613f9f788fb70df… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 13 13:19:38 2019 +0430 wined3d: Move the backup window from struct wined3d_swapchain to struct wined3d_swapchain_gl. 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/swapchain.c | 32 ++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 8 ++++---- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8a6cd5c..89f37cd 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1231,7 +1231,7 @@ success: static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context_gl) { - struct wined3d_swapchain *swapchain = context_gl->c.swapchain; + struct wined3d_swapchain_gl *swapchain_gl = wined3d_swapchain_gl(context_gl->c.swapchain); BOOL backup = FALSE; if (!wined3d_context_gl_set_pixel_format(context_gl)) @@ -1252,14 +1252,14 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context * a swapchain, so we can't use the swapchain to get a backup dc. To * make this work windowless contexts would need to be handled by the * device. */ - if (context_gl->c.destroyed || !swapchain) + if (context_gl->c.destroyed || !swapchain_gl) { FIXME("Unable to get backup dc for destroyed context %p.\n", context_gl); wined3d_context_gl_set_current(NULL); return FALSE; } - if (!(context_gl->dc = swapchain_get_backup_dc(swapchain))) + if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl))) { wined3d_context_gl_set_current(NULL); return FALSE; @@ -1968,7 +1968,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi if (!context_gl->dc) { - if (!(context_gl->dc = swapchain_get_backup_dc(context->swapchain))) + if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(wined3d_swapchain_gl(context->swapchain)))) { ERR("Failed to retrieve a device context.\n"); return E_FAIL; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c0eeca5..eb515f0 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -95,19 +95,19 @@ void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) wined3d_swapchain_state_restore_from_fullscreen(&swapchain->state, swapchain->state.device_window, NULL); } } - - if (swapchain->backup_dc) - { - TRACE("Destroying backup wined3d window %p, dc %p.\n", swapchain->backup_wnd, swapchain->backup_dc); - - wined3d_release_dc(swapchain->backup_wnd, swapchain->backup_dc); - DestroyWindow(swapchain->backup_wnd); - } } void wined3d_swapchain_gl_cleanup(struct wined3d_swapchain_gl *swapchain_gl) { wined3d_swapchain_cleanup(&swapchain_gl->s); + + if (swapchain_gl->backup_dc) + { + TRACE("Destroying backup wined3d window %p, dc %p.\n", swapchain_gl->backup_wnd, swapchain_gl->backup_dc); + + wined3d_release_dc(swapchain_gl->backup_wnd, swapchain_gl->backup_dc); + DestroyWindow(swapchain_gl->backup_wnd); + } } ULONG CDECL wined3d_swapchain_incref(struct wined3d_swapchain *swapchain) @@ -1162,29 +1162,29 @@ struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchai return swapchain_create_context(swapchain); } -HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) +HDC wined3d_swapchain_gl_get_backup_dc(struct wined3d_swapchain_gl *swapchain_gl) { - if (!swapchain->backup_dc) + if (!swapchain_gl->backup_dc) { - TRACE("Creating the backup window for swapchain %p.\n", swapchain); + TRACE("Creating the backup window for swapchain %p.\n", swapchain_gl); - if (!(swapchain->backup_wnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", + if (!(swapchain_gl->backup_wnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL))) { ERR("Failed to create a window.\n"); return NULL; } - if (!(swapchain->backup_dc = GetDC(swapchain->backup_wnd))) + if (!(swapchain_gl->backup_dc = GetDC(swapchain_gl->backup_wnd))) { ERR("Failed to get a DC.\n"); - DestroyWindow(swapchain->backup_wnd); - swapchain->backup_wnd = NULL; + DestroyWindow(swapchain_gl->backup_wnd); + swapchain_gl->backup_wnd = NULL; return NULL; } } - return swapchain->backup_dc; + return swapchain_gl->backup_dc; } void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1e4e139..4ce2a2a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4404,16 +4404,12 @@ struct wined3d_swapchain struct wined3d_swapchain_state state; HWND win_handle; - - HDC backup_dc; - HWND backup_wnd; }; void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) DECLSPEC_HIDDEN; void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; -HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_set_max_frame_latency(struct wined3d_swapchain *swapchain, const struct wined3d_device *device) DECLSPEC_HIDDEN; @@ -4425,6 +4421,9 @@ HRESULT wined3d_swapchain_no3d_init(struct wined3d_swapchain *swapchain_no3d, struct wined3d_swapchain_gl { struct wined3d_swapchain s; + + HDC backup_dc; + HWND backup_wnd; }; static inline struct wined3d_swapchain_gl *wined3d_swapchain_gl(struct wined3d_swapchain *swapchain) @@ -4433,6 +4432,7 @@ static inline struct wined3d_swapchain_gl *wined3d_swapchain_gl(struct wined3d_s } void wined3d_swapchain_gl_cleanup(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; +HDC wined3d_swapchain_gl_get_backup_dc(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Move the context array from struct wined3d_swapchain to struct wined3d_swapchain_gl.
by Alexandre Julliard 13 Aug '19

13 Aug '19

Module: wine Branch: master Commit: b27f961eebf8f4be18ce19cc117ba08dc88ce4c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b27f961eebf8f4be18ce19cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 13 13:19:39 2019 +0430 wined3d: Move the context array from struct wined3d_swapchain to struct wined3d_swapchain_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/context.c | 18 +++++----- dlls/wined3d/device.c | 5 +-- dlls/wined3d/swapchain.c | 80 +++++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 14 ++++---- 5 files changed, 64 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b27f961eebf8f4be18ce…

1 0

Henri Verbeet : wined3d: Get rid of a redundant NULL check in wined3d_context_gl_acquire() ( Coverity).
by Alexandre Julliard 13 Aug '19

13 Aug '19

Module: wine Branch: master Commit: 9bbe8ec59027aeb2d4558bb85a8acf75cc9c79fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bbe8ec59027aeb2d4558bb8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 13 13:19:40 2019 +0430 wined3d: Get rid of a redundant NULL check in wined3d_context_gl_acquire() (Coverity). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6742f21..2d22409 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4238,7 +4238,7 @@ struct wined3d_context *wined3d_context_gl_acquire(const struct wined3d_device * { context_gl = current_context; } - else if (texture && !wined3d_resource_is_offscreen(&texture->resource)) + else if (!wined3d_resource_is_offscreen(&texture->resource)) { TRACE("Rendering onscreen.\n");

1 0

Alex Henrie : wtsapi32: Add stubs for WTSEnumerateProcessesEx[AW].
by Alexandre Julliard 13 Aug '19

13 Aug '19

Module: wine Branch: master Commit: ec69403384eaca8ff7305dc3153506e7ba0645a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec69403384eaca8ff7305dc3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 13 01:17:42 2019 -0600 wtsapi32: Add stubs for WTSEnumerateProcessesEx[AW]. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47612 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/wtsapi32.c | 21 +++++++++++++++++++++ dlls/wtsapi32/wtsapi32.spec | 2 ++ 2 files changed, 23 insertions(+) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 2f5e73d..72025c3 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -70,6 +70,27 @@ BOOL WINAPI WTSEnableChildSessions(BOOL enable) return TRUE; } + +/************************************************************ + * WTSEnumerateProcessesExW (WTSAPI32.@) + */ +BOOL WINAPI WTSEnumerateProcessesExW(HANDLE server, DWORD *level, DWORD session_id, WCHAR **info, DWORD *count) +{ + FIXME("Stub %p %p %d %p %p\n", server, level, session_id, info, count); + if (count) *count = 0; + return FALSE; +} + +/************************************************************ + * WTSEnumerateProcessesExA (WTSAPI32.@) + */ +BOOL WINAPI WTSEnumerateProcessesExA(HANDLE server, DWORD *level, DWORD session_id, char **info, DWORD *count) +{ + FIXME("Stub %p %p %d %p %p\n", server, level, session_id, info, count); + if (count) *count = 0; + return FALSE; +} + /************************************************************ * WTSEnumerateProcessesA (WTSAPI32.@) */ diff --git a/dlls/wtsapi32/wtsapi32.spec b/dlls/wtsapi32/wtsapi32.spec index 2b01741..5d70da7 100644 --- a/dlls/wtsapi32/wtsapi32.spec +++ b/dlls/wtsapi32/wtsapi32.spec @@ -4,6 +4,8 @@ @ stdcall WTSDisconnectSession(long long long) @ stdcall WTSEnableChildSessions(long) @ stdcall WTSEnumerateProcessesA(long long long ptr ptr) +@ stdcall WTSEnumerateProcessesExA(ptr ptr long ptr ptr) +@ stdcall WTSEnumerateProcessesExW(ptr ptr long ptr ptr) @ stdcall WTSEnumerateProcessesW(long long long ptr ptr) @ stdcall WTSEnumerateServersA(ptr long long ptr ptr) @ stdcall WTSEnumerateServersW(ptr long long ptr ptr)

1 0