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

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

June 3, 2019

Module: wine Branch: master Commit: 7d3eda5783a8ca4d13278ac03d10d074f68df9c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d3eda5783a8ca4d13278ac0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 3 18:28:21 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_activate(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ba3ac80..2f3ed39 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4211,23 +4211,21 @@ static void context_setup_target(struct wined3d_context *context, context_set_render_offscreen(context, render_offscreen); } -static void context_activate(struct wined3d_context *context, +static void wined3d_context_gl_activate(struct wined3d_context_gl *context_gl, struct wined3d_texture *texture, unsigned int sub_resource_idx) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - wined3d_context_gl_enter(context_gl); wined3d_context_gl_update_window(context_gl); - context_setup_target(context, texture, sub_resource_idx); - if (!context->valid) + context_setup_target(&context_gl->c, texture, sub_resource_idx); + if (!context_gl->c.valid) return; - if (context != context_get_current()) + if (&context_gl->c != context_get_current()) { - if (!context_set_current(context)) + if (!context_set_current(&context_gl->c)) ERR("Failed to activate the new context.\n"); } - else if (context->needs_set) + else if (context_gl->c.needs_set) { wined3d_context_gl_set_gl_context(context_gl); } @@ -4292,7 +4290,7 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, return NULL; } - context_activate(context, texture, sub_resource_idx); + wined3d_context_gl_activate(wined3d_context_gl(context), texture, sub_resource_idx); return context; } @@ -4309,7 +4307,8 @@ struct wined3d_context *context_reacquire(const struct wined3d_device *device, if (context->current_rt.texture) { - context_activate(context, context->current_rt.texture, context->current_rt.sub_resource_idx); + wined3d_context_gl_activate(wined3d_context_gl(context), + context->current_rt.texture, context->current_rt.sub_resource_idx); return context; }

1 0

Nikolay Sivov : comctl32/trackbar: Do not consider window size when initializing fixed length thumb.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: d5f8eb333c5c000a3ea986ea532c0ba030ebad88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5f8eb333c5c000a3ea986ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 3 13:10:04 2019 +0300 comctl32/trackbar: Do not consider window size when initializing fixed length thumb. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47143 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 18 +++++++++++++++++- dlls/comctl32/trackbar.c | 19 +++++++++++-------- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 7f17e9e4b..eb54644 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -931,7 +931,7 @@ static void test_selection(void) static void test_thumb_length(void) { HWND hWndTrackbar; - int r; + int r, r2; hWndTrackbar = create_trackbar(defaultstyle, hWndParent); ok(hWndTrackbar != NULL, "Expected non NULL value\n"); @@ -963,6 +963,22 @@ static void test_thumb_length(void) ok_sequence(sequences, PARENT_SEQ_INDEX, parent_thumb_length_test_seq, "parent thumb length test sequence", TRUE); DestroyWindow(hWndTrackbar); + + /* Fixed thumb length does not depend on window size. */ + hWndTrackbar = CreateWindowA(TRACKBAR_CLASSA, "Trackbar Control", WS_VISIBLE | TBS_ENABLESELRANGE + | TBS_FIXEDLENGTH, 0, 0, 0, 0, hWndParent, NULL, GetModuleHandleA(NULL), NULL); + + r = SendMessageA(hWndTrackbar, TBM_GETTHUMBLENGTH, 0, 0); + + DestroyWindow(hWndTrackbar); + + hWndTrackbar = CreateWindowA(TRACKBAR_CLASSA, "Trackbar Control", WS_VISIBLE | TBS_ENABLESELRANGE + | TBS_FIXEDLENGTH, 0, 0, 200, 200, hWndParent, NULL, GetModuleHandleA(NULL), NULL); + + r2 = SendMessageA(hWndTrackbar, TBM_GETTHUMBLENGTH, 0, 0); + ok(r2 == r, "Unexpected thumb length %d.\n", r); + + DestroyWindow(hWndTrackbar); } static void test_tic_settings(void) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index c3b9b27..de3f93e 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1481,15 +1481,18 @@ TRACKBAR_InitializeThumb (TRACKBAR_INFO *infoPtr) infoPtr->uThumbLen = get_scaled_metric(infoPtr, infoPtr->dwStyle & TBS_ENABLESELRANGE ? 23 : 21); - GetClientRect(infoPtr->hwndSelf,&rect); - if (infoPtr->dwStyle & TBS_VERT) - client_size = rect.right - rect.left; - else - client_size = rect.bottom - rect.top; + if (!(infoPtr->dwStyle & TBS_FIXEDLENGTH)) + { + GetClientRect(infoPtr->hwndSelf, &rect); + if (infoPtr->dwStyle & TBS_VERT) + client_size = rect.right - rect.left; + else + client_size = rect.bottom - rect.top; - if (client_size < infoPtr->uThumbLen) - infoPtr->uThumbLen = client_size > get_scaled_metric(infoPtr, 9) ? - client_size - get_scaled_metric(infoPtr, 5) : get_scaled_metric(infoPtr, 4); + if (client_size < infoPtr->uThumbLen) + infoPtr->uThumbLen = client_size > get_scaled_metric(infoPtr, 9) ? + client_size - get_scaled_metric(infoPtr, 5) : get_scaled_metric(infoPtr, 4); + } TRACKBAR_CalcChannel (infoPtr); TRACKBAR_UpdateThumb (infoPtr);

1 0

Michael Stefaniuc : shell32: Don't cast from COM object to interface.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: 245417571ab9f9a9715c4f349f7a2a0963a99220 URL: https://source.winehq.org/git/wine.git/?a=commit;h=245417571ab9f9a9715c4f34… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 31 23:14:53 2019 +0200 shell32: Don't cast from COM object to interface. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dataobject.c | 2 +- dlls/shell32/shellole.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index 3e718a3..5c0dbc6 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -187,7 +187,7 @@ LPENUMFORMATETC IEnumFORMATETC_Constructor(UINT cfmt, const FORMATETC afmt[]) } TRACE("(%p)->(%u,%p)\n",ef, cfmt, afmt); - return (LPENUMFORMATETC)ef; + return &ef->IEnumFORMATETC_iface; } diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 3fe9680..1ab8f38 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -401,7 +401,7 @@ static IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pc lpclf->riidInst = riidInst; TRACE("(%p)%s\n",lpclf, shdebugstr_guid(riidInst)); - return (LPCLASSFACTORY)lpclf; + return &lpclf->IClassFactory_iface; } /************************************************************************** * IDefClF_fnQueryInterface

1 0

Alexandre Julliard : dswave: Build with msvcrt.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: c7c0706b04ebe04ec97d59bf997179b228e1e4f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7c0706b04ebe04ec97d59bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:46:38 2019 +0200 dswave: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dswave/Makefile.in | 2 ++ dlls/dswave/dswave_main.c | 2 -- dlls/dswave/dswave_private.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dswave/Makefile.in b/dlls/dswave/Makefile.in index 9a08518..13a957d 100644 --- a/dlls/dswave/Makefile.in +++ b/dlls/dswave/Makefile.in @@ -1,6 +1,8 @@ MODULE = dswave.dll IMPORTS = dxguid uuid ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ dmobject.c \ dswave.c \ diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index a136bb8..bb554de 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include <stdio.h> #include <stdarg.h> diff --git a/dlls/dswave/dswave_private.h b/dlls/dswave/dswave_private.h index 8dea3a9..3554cde 100644 --- a/dlls/dswave/dswave_private.h +++ b/dlls/dswave/dswave_private.h @@ -32,7 +32,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "winreg.h" #include "objbase.h"

1 0

Alexandre Julliard : dsquery: Build with msvcrt.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: 4e5dba8b874900709ef239e87fde3ee56c4471f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e5dba8b874900709ef239e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:34:43 2019 +0200 dsquery: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsquery/Makefile.in | 2 ++ dlls/dsquery/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dsquery/Makefile.in b/dlls/dsquery/Makefile.in index 611e601..85ac989 100644 --- a/dlls/dsquery/Makefile.in +++ b/dlls/dsquery/Makefile.in @@ -1,6 +1,8 @@ MODULE = dsquery.dll IMPORTS = uuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/dsquery/main.c b/dlls/dsquery/main.c index 7f58502..ea367b6 100644 --- a/dlls/dsquery/main.c +++ b/dlls/dsquery/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h>

1 0

Alexandre Julliard : dmusic32: Build with msvcrt.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: 6f56059e6a510e8b1608e3345d22c93ef994f8ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f56059e6a510e8b1608e334… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:31:11 2019 +0200 dmusic32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic32/Makefile.in | 2 ++ dlls/dmusic32/dmusic32_main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dmusic32/Makefile.in b/dlls/dmusic32/Makefile.in index 0b0e250..796b4e7 100644 --- a/dlls/dmusic32/Makefile.in +++ b/dlls/dmusic32/Makefile.in @@ -1,6 +1,8 @@ MODULE = dmusic32.dll IMPORTS = uuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ dmusic32_main.c diff --git a/dlls/dmusic32/dmusic32_main.c b/dlls/dmusic32/dmusic32_main.c index 769d5c0..f0ef263 100644 --- a/dlls/dmusic32/dmusic32_main.c +++ b/dlls/dmusic32/dmusic32_main.c @@ -26,7 +26,6 @@ #include "winuser.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "objbase.h" #include "dmusici.h"

1 0

Alexandre Julliard : ntdll: Fix off-by-one allocation error.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: d96fd000d3e71fed67c5182d06dc9ce3aa091973 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d96fd000d3e71fed67c5182d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:28:29 2019 +0200 ntdll: Fix off-by-one allocation error. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47311 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1660667..b5bf219 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2313,7 +2313,7 @@ static NTSTATUS find_builtin_dll( const WCHAR *name, WINE_MODREF **pwm, len = strlenW( name ); if (build_dir) maxlen = strlen(build_dir) + sizeof("/programs/") + len; - for (i = 0; (path = wine_dll_enum_load_path( i )); i++) maxlen = max( maxlen, strlen(path) ); + for (i = 0; (path = wine_dll_enum_load_path( i )); i++) maxlen = max( maxlen, strlen(path)+1 ); maxlen += len + sizeof(".so"); if (!(file = RtlAllocateHeap( GetProcessHeap(), 0, maxlen ))) return STATUS_NO_MEMORY;

1 0

Alexandre Julliard : dmloader: Build with msvcrt.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: a420853848a8bbe083c9caeef3bd38eef226227b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a420853848a8bbe083c9caee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:29:43 2019 +0200 dmloader: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/Makefile.in | 2 ++ dlls/dmloader/container.c | 2 +- dlls/dmloader/debug.c | 2 -- dlls/dmloader/dmloader_private.h | 1 - dlls/dmloader/loader.c | 50 ++++++++++++++++++++-------------------- 5 files changed, 28 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a420853848a8bbe083c9…

1 0

Sven Baars : mmdevapi/tests: Use PropVariantClear after calling IPropertyStore_GetValue (Valgrind).
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: acea82ac74ebe92cf9aaf0f2184f17daa5030484 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acea82ac74ebe92cf9aaf0f2… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Jun 2 12:01:23 2019 +0200 mmdevapi/tests: Use PropVariantClear after calling IPropertyStore_GetValue (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/propstore.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 02340ba..bbd4ffe 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -58,23 +58,26 @@ static void test_propertystore(IPropertyStore *store) { WideCharToMultiByte(CP_ACP, 0, pv.u.pwszVal, -1, temp, sizeof(temp)-1, NULL, NULL); trace("guid: %s\n", temp); - CoTaskMemFree(pv.u.pwszVal); + PropVariantClear(&pv); } pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); ok(hr == S_OK, "Failed with %08x\n", hr); ok(pv.vt == VT_LPWSTR && pv.u.pwszVal, "FriendlyName value had wrong type: 0x%x or was NULL\n", pv.vt); + PropVariantClear(&pv); pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_Enabled, &pv); ok(hr == S_OK, "Failed with %08x\n", hr); ok(pv.vt == VT_EMPTY, "Key should not be found\n"); + PropVariantClear(&pv); pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_ClassGuid, &pv); ok(hr == S_OK, "Failed with %08x\n", hr); ok(pv.vt == VT_EMPTY, "Key should not be found\n"); + PropVariantClear(&pv); } static void test_deviceinterface(IPropertyStore *store) @@ -91,7 +94,7 @@ static void test_deviceinterface(IPropertyStore *store) ok(hr == S_OK, "GetValue failed: %08x\n", hr); ok(pv.vt == VT_LPWSTR, "Got wrong variant type: 0x%x\n", pv.vt); trace("device interface: %s\n", wine_dbgstr_w(pv.u.pwszVal)); - CoTaskMemFree(pv.u.pwszVal); + PropVariantClear(&pv); } static void test_getat(IPropertyStore *store)

1 0

Michael Stefaniuc : winemac.drv: Avoid casts from COM objects to interfaces.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: 3e0857446132dc47f3a2e17c7f8a31c74c0b9a4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e0857446132dc47f3a2e17c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 29 22:47:28 2019 +0200 winemac.drv: Avoid casts from COM objects to interfaces. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/dragdrop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index e089018..c1f542f 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -60,8 +60,8 @@ static HRESULT WINAPI dddo_QueryInterface(IDataObject* iface, REFIID riid, LPVOI if (IsEqualIID(riid, &IID_IUnknown) || (IsEqualIID(riid, &IID_IDataObject))) { - *ppvObj = This; - IUnknown_AddRef((IUnknown*)This); + *ppvObj = iface; + IDataObject_AddRef(iface); return S_OK; }

1 0