October 2018 - Wine-commits

Tag vkd3d-1.1 : Alexandre Julliard : Release 1.1
by Alexandre Julliard 05 Oct '18

05 Oct '18

Module: vkd3d Branch: refs/tags/vkd3d-1.1 Tag: e32712ca96b0305ec4ecf7f445379e20d31c5402 URL: https://source.winehq.org/git/vkd3d.git/?a=tag;h=e32712ca96b0305ec4ecf7f445… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 5 13:48:18 2018 -0500 Release 1.1

1 0

Bernhard Übelacker : services/tests: Retrieve monitor information when executed as service.
by Alexandre Julliard 04 Oct '18

04 Oct '18

Module: wine Branch: master Commit: a8a2c0b9c5873e73949b9003480258b0766f4f75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8a2c0b9c5873e73949b9003… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Tue Oct 2 16:27:42 2018 +0200 services/tests: Retrieve monitor information when executed as service. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43187 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/tests/service.c | 48 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 728d515..c68d37a 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -35,6 +35,8 @@ static SERVICE_STATUS_HANDLE service_handle; /* Service process global variables */ static HANDLE service_stop_event; +static int monitor_count; + static void send_msg(const char *type, const char *msg) { DWORD written = 0; @@ -127,6 +129,51 @@ static void test_create_window(void) service_ok(r, "DestroyWindow failed: %08x\n", GetLastError()); } +static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPARAM lparam) +{ + BOOL r; + MONITORINFOEXA mi; + + service_ok(hmon != NULL, "Unexpected hmon=%#x\n", hmon); + + monitor_count++; + + mi.cbSize = sizeof(mi); + + SetLastError(0xdeadbeef); + r = GetMonitorInfoA(NULL, (MONITORINFO*)&mi); + service_ok(GetLastError() == ERROR_INVALID_MONITOR_HANDLE, "Unexpected GetLastError: %#x.\n", GetLastError()); + service_ok(!r, "GetMonitorInfo with NULL HMONITOR succeeded.\n"); + + r = GetMonitorInfoA(hmon, (MONITORINFO*)&mi); + service_ok(r, "GetMonitorInfo failed.\n"); + + service_ok(mi.rcMonitor.left == 0 && mi.rcMonitor.top == 0 && mi.rcMonitor.right >= 640 && mi.rcMonitor.bottom >= 480, + "Unexepected monitor rcMonitor values: {%d,%d,%d,%d}\n", + mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom); + + service_ok(mi.rcWork.left == 0 && mi.rcWork.top == 0 && mi.rcWork.right >= 640 && mi.rcWork.bottom >= 480, + "Unexepected monitor rcWork values: {%d,%d,%d,%d}\n", + mi.rcWork.left, mi.rcWork.top, mi.rcWork.right, mi.rcWork.bottom); + + service_ok(!strcmp(mi.szDevice, "WinDisc") || !strcmp(mi.szDevice, "\\\\.\\DISPLAY1"), + "Unexpected szDevice received: %s\n", mi.szDevice); + + service_ok(mi.dwFlags == MONITORINFOF_PRIMARY, "Unexpected secondary monitor info.\n"); + + return TRUE; +} + +/* query informations monitor information, even in non-interactive services */ +static void test_monitors(void) +{ + BOOL r; + + r = EnumDisplayMonitors(0, 0, monitor_enum_proc, 0); + service_ok(r, "EnumDisplayMonitors failed.\n"); + service_ok(monitor_count == 1, "Callback got called less or more than once. %d\n", monitor_count); +} + static DWORD WINAPI service_handler(DWORD ctrl, DWORD event_type, void *event_data, void *context) { SERVICE_STATUS status; @@ -151,6 +198,7 @@ static DWORD WINAPI service_handler(DWORD ctrl, DWORD event_type, void *event_da case 128: test_winstation(); test_create_window(); + test_monitors(); service_event("CUSTOM"); return 0xdeadbeef; default:

1 0

Zhiyi Zhang : rsaenh: Move PKCS1 padding and unpadding functions.
by Alexandre Julliard 04 Oct '18

04 Oct '18

Module: wine Branch: master Commit: 07232b3870b60fcd5cd5aadc923ab9085cdf8774 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07232b3870b60fcd5cd5aadc… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 2 16:37:04 2018 +0800 rsaenh: Move PKCS1 padding and unpadding functions. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/rsaenh.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 1332073..e4c6dd1 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1655,7 +1655,7 @@ exit: } /****************************************************************************** - * pad_data [Internal] + * pad_data_pkcs1 [Internal] * * Helper function for data padding according to PKCS1 #2 * @@ -1670,8 +1670,7 @@ exit: * Success: TRUE * Failure: FALSE (NTE_BAD_LEN, too much data to pad) */ -static BOOL pad_data(const BYTE *abData, DWORD dwDataLen, BYTE *abBuffer, DWORD dwBufferLen, - DWORD dwFlags) +static BOOL pad_data_pkcs1(const BYTE *abData, DWORD dwDataLen, BYTE *abBuffer, DWORD dwBufferLen, DWORD dwFlags) { DWORD i; @@ -1696,7 +1695,29 @@ static BOOL pad_data(const BYTE *abData, DWORD dwDataLen, BYTE *abBuffer, DWORD } /****************************************************************************** - * unpad_data [Internal] + * pad_data [Internal] + * + * Helper function for data padding according to padding format + * + * PARAMS + * abData [I] The data to be padded + * dwDataLen [I] Length of the data + * abBuffer [O] Padded data will be stored here + * dwBufferLen [I] Length of the buffer (also length of padded data) + * dwFlags [I] 0 or CRYPT_SSL2_FALLBACK + * + * RETURN + * Success: TRUE + * Failure: FALSE + */ +static BOOL pad_data(const BYTE *abData, DWORD dwDataLen, BYTE *abBuffer, DWORD dwBufferLen, + DWORD dwFlags) +{ + return pad_data_pkcs1(abData, dwDataLen, abBuffer, dwBufferLen, dwFlags); +} + +/****************************************************************************** + * unpad_data_pkcs1 [Internal] * * Remove the PKCS1 padding from RSA decrypted data * @@ -1711,8 +1732,7 @@ static BOOL pad_data(const BYTE *abData, DWORD dwDataLen, BYTE *abBuffer, DWORD * Success: TRUE * Failure: FALSE, (NTE_BAD_DATA, no valid PKCS1 padding or buffer too small) */ -static BOOL unpad_data(const BYTE *abData, DWORD dwDataLen, BYTE *abBuffer, DWORD *dwBufferLen, - DWORD dwFlags) +static BOOL unpad_data_pkcs1(const BYTE *abData, DWORD dwDataLen, BYTE *abBuffer, DWORD *dwBufferLen, DWORD dwFlags) { DWORD i; @@ -1738,6 +1758,28 @@ static BOOL unpad_data(const BYTE *abData, DWORD dwDataLen, BYTE *abBuffer, DWOR } /****************************************************************************** + * unpad_data [Internal] + * + * Remove the padding from RSA decrypted data according to padding format + * + * PARAMS + * abData [I] The padded data + * dwDataLen [I] Length of the padded data + * abBuffer [O] Data without padding will be stored here + * dwBufferLen [I/O] I: Length of the buffer, O: Length of unpadded data + * dwFlags [I] Currently none defined + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +static BOOL unpad_data(const BYTE *abData, DWORD dwDataLen, BYTE *abBuffer, DWORD *dwBufferLen, + DWORD dwFlags) +{ + return unpad_data_pkcs1(abData, dwDataLen, abBuffer, dwBufferLen, dwFlags); +} + +/****************************************************************************** * CPAcquireContext (RSAENH.@) * * Acquire a handle to the key container specified by pszContainer

1 0

Zhiyi Zhang : rsaenh: Implement RSA OAEP.
by Alexandre Julliard 04 Oct '18

04 Oct '18

Module: wine Branch: master Commit: af605f8b3889d6f8e7d062cb9079f8f69d759b43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af605f8b3889d6f8e7d062cb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 2 16:37:30 2018 +0800 rsaenh: Implement RSA OAEP. Implement RSA optimal asymmetric encryption padding according to RFC 8017. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/rsaenh.c | 298 ++++++++++++++++++++++++++++++++++++++++++--- dlls/rsaenh/tests/rsaenh.c | 49 +++++++- 2 files changed, 332 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af605f8b3889d6f8e7d0…

1 0

Nikolay Sivov : d2d1: Use correct interpolation mode enum type member.
by Alexandre Julliard 04 Oct '18

04 Oct '18

Module: wine Branch: master Commit: 00b40eac91301380247d2930f5b7ee5caa7cf791 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00b40eac91301380247d2930… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 4 14:37:32 2018 +0300 d2d1: Use correct interpolation mode enum type member. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 9c73ae1..dd3da32 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1113,7 +1113,7 @@ HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap, { (*brush)->u.bitmap.extend_mode_x = D2D1_EXTEND_MODE_CLAMP; (*brush)->u.bitmap.extend_mode_y = D2D1_EXTEND_MODE_CLAMP; - (*brush)->u.bitmap.interpolation_mode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR; + (*brush)->u.bitmap.interpolation_mode = D2D1_INTERPOLATION_MODE_LINEAR; } TRACE("Created brush %p.\n", *brush);

1 0

Nikolay Sivov : d2d1: Handle invalid interpolation mode in DrawBitmap().
by Alexandre Julliard 04 Oct '18

04 Oct '18

Module: wine Branch: master Commit: 56703ff9a6ac6104e692b34544d8c3be572404de URL: https://source.winehq.org/git/wine.git/?a=commit;h=56703ff9a6ac6104e692b345… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 4 14:37:33 2018 +0300 d2d1: Handle invalid interpolation mode in DrawBitmap(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 8 ++++++++ dlls/d2d1/tests/d2d1.c | 13 +++++++++++++ 2 files changed, 21 insertions(+) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 45b2258..75357b6 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1006,6 +1006,7 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawBitmap(ID2D1DeviceContext * ID2D1Bitmap *bitmap, const D2D1_RECT_F *dst_rect, float opacity, D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode, const D2D1_RECT_F *src_rect) { + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); D2D1_BITMAP_BRUSH_PROPERTIES bitmap_brush_desc; D2D1_BRUSH_PROPERTIES brush_desc; ID2D1BitmapBrush *brush; @@ -1015,6 +1016,13 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawBitmap(ID2D1DeviceContext * TRACE("iface %p, bitmap %p, dst_rect %s, opacity %.8e, interpolation_mode %#x, src_rect %s.\n", iface, bitmap, debug_d2d_rect_f(dst_rect), opacity, interpolation_mode, debug_d2d_rect_f(src_rect)); + if (interpolation_mode != D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR + && interpolation_mode != D2D1_BITMAP_INTERPOLATION_MODE_LINEAR) + { + context->error.code = E_INVALIDARG; + return; + } + if (src_rect) { s = *src_rect; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 0bea1c8..3b82470 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1815,6 +1815,19 @@ static void test_bitmap_brush(void) match = compare_surface(surface, "9437f4447d98feaad41a1c4202ee90aadc718ee6"); ok(match, "Surface does not match.\n"); + /* Invalid interpolation mode. */ + ID2D1RenderTarget_BeginDraw(rt); + + set_rect(&dst_rect, 1.0f, 8.0f, 4.0f, 12.0f); + set_rect(&src_rect, 2.0f, 1.0f, 4.0f, 3.0f); + ID2D1RenderTarget_DrawBitmap(rt, bitmap, &dst_rect, 1.0f, + D2D1_BITMAP_INTERPOLATION_MODE_LINEAR + 1, &src_rect); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + match = compare_surface(surface, "9437f4447d98feaad41a1c4202ee90aadc718ee6"); + ok(match, "Surface does not match.\n"); + ID2D1RenderTarget_BeginDraw(rt); ID2D1RenderTarget_Clear(rt, &color);

1 0

Nikolay Sivov : d2d1: Partially implement d2d_device_context_ID2D1DeviceContext_DrawBitmap().
by Alexandre Julliard 04 Oct '18

04 Oct '18

Module: wine Branch: master Commit: 5cc501b0a9ac201ad300d6d2337801d4c66f9f0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cc501b0a9ac201ad300d6d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 4 14:37:34 2018 +0300 d2d1: Partially implement d2d_device_context_ID2D1DeviceContext_DrawBitmap(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 56 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 75357b6..bfd1494 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1002,26 +1002,18 @@ static void STDMETHODCALLTYPE d2d_device_context_FillOpacityMask(ID2D1DeviceCont iface, mask, brush, content, debug_d2d_rect_f(dst_rect), debug_d2d_rect_f(src_rect)); } -static void STDMETHODCALLTYPE d2d_device_context_DrawBitmap(ID2D1DeviceContext *iface, - ID2D1Bitmap *bitmap, const D2D1_RECT_F *dst_rect, float opacity, - D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode, const D2D1_RECT_F *src_rect) +static void d2d_device_context_draw_bitmap(struct d2d_device_context *context, ID2D1Bitmap *bitmap, + const D2D1_RECT_F *dst_rect, float opacity, D2D1_INTERPOLATION_MODE interpolation_mode, + const D2D1_RECT_F *src_rect, const D2D1_MATRIX_4X4_F *perspective_transform) { - struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); - D2D1_BITMAP_BRUSH_PROPERTIES bitmap_brush_desc; + D2D1_BITMAP_BRUSH_PROPERTIES1 bitmap_brush_desc; D2D1_BRUSH_PROPERTIES brush_desc; - ID2D1BitmapBrush *brush; + struct d2d_brush *brush; D2D1_RECT_F s, d; HRESULT hr; - TRACE("iface %p, bitmap %p, dst_rect %s, opacity %.8e, interpolation_mode %#x, src_rect %s.\n", - iface, bitmap, debug_d2d_rect_f(dst_rect), opacity, interpolation_mode, debug_d2d_rect_f(src_rect)); - - if (interpolation_mode != D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR - && interpolation_mode != D2D1_BITMAP_INTERPOLATION_MODE_LINEAR) - { - context->error.code = E_INVALIDARG; - return; - } + if (perspective_transform) + FIXME("Perspective transform is ignored.\n"); if (src_rect) { @@ -1062,14 +1054,33 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawBitmap(ID2D1DeviceContext * brush_desc.transform._22 = fabsf((d.bottom - d.top) / (s.bottom - s.top)); brush_desc.transform._32 = min(d.top, d.bottom) - min(s.top, s.bottom) * brush_desc.transform._22; - if (FAILED(hr = d2d_device_context_CreateBitmapBrush(iface, bitmap, &bitmap_brush_desc, &brush_desc, &brush))) + if (FAILED(hr = d2d_bitmap_brush_create(context->factory, bitmap, &bitmap_brush_desc, &brush_desc, &brush))) { ERR("Failed to create bitmap brush, hr %#x.\n", hr); return; } - d2d_device_context_FillRectangle(iface, &d, (ID2D1Brush *)brush); - ID2D1BitmapBrush_Release(brush); + d2d_device_context_FillRectangle(&context->ID2D1DeviceContext_iface, &d, &brush->ID2D1Brush_iface); + ID2D1Brush_Release(&brush->ID2D1Brush_iface); +} + +static void STDMETHODCALLTYPE d2d_device_context_DrawBitmap(ID2D1DeviceContext *iface, + ID2D1Bitmap *bitmap, const D2D1_RECT_F *dst_rect, float opacity, + D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode, const D2D1_RECT_F *src_rect) +{ + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + + TRACE("iface %p, bitmap %p, dst_rect %s, opacity %.8e, interpolation_mode %#x, src_rect %s.\n", + iface, bitmap, debug_d2d_rect_f(dst_rect), opacity, interpolation_mode, debug_d2d_rect_f(src_rect)); + + if (interpolation_mode != D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR + && interpolation_mode != D2D1_BITMAP_INTERPOLATION_MODE_LINEAR) + { + context->error.code = E_INVALIDARG; + return; + } + + d2d_device_context_draw_bitmap(context, bitmap, dst_rect, opacity, interpolation_mode, src_rect, NULL); } static void STDMETHODCALLTYPE d2d_device_context_DrawText(ID2D1DeviceContext *iface, @@ -2154,10 +2165,15 @@ static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_DrawBitmap(I ID2D1Bitmap *bitmap, const D2D1_RECT_F *dst_rect, float opacity, D2D1_INTERPOLATION_MODE interpolation_mode, const D2D1_RECT_F *src_rect, const D2D1_MATRIX_4X4_F *perspective_transform) { - FIXME("iface %p, bitmap %p, dst_rect %s, opacity %.8e, interpolation_mode %#x, " - "src_rect %s, perspective_transform %p stub!\n", + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + + TRACE("iface %p, bitmap %p, dst_rect %s, opacity %.8e, interpolation_mode %#x, " + "src_rect %s, perspective_transform %p.\n", iface, bitmap, debug_d2d_rect_f(dst_rect), opacity, interpolation_mode, debug_d2d_rect_f(src_rect), perspective_transform); + + d2d_device_context_draw_bitmap(context, bitmap, dst_rect, opacity, interpolation_mode, src_rect, + perspective_transform); } static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_PushLayer(ID2D1DeviceContext *iface,

1 0

Zebediah Figura : makefiles: Only generate proxy code for the target architecture.
by Alexandre Julliard 04 Oct '18

04 Oct '18

Module: wine Branch: master Commit: ee206a37609f99e9dc024dbe19d4a9b842433813 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee206a37609f99e9dc024dbe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 30 22:24:32 2018 -0500 makefiles: Only generate proxy code for the target architecture. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 + configure | 11 +++++++++++ configure.ac | 5 +++++ tools/makedep.c | 3 +++ 4 files changed, 20 insertions(+) diff --git a/Makefile.in b/Makefile.in index 6b65fdf..c1242af 100644 --- a/Makefile.in +++ b/Makefile.in @@ -49,6 +49,7 @@ MSVCRTFLAGS = @BUILTINFLAG@ TARGETFLAGS = @TARGETFLAGS@ UNWINDFLAGS = @UNWINDFLAGS@ LDEXECFLAGS = @LDEXECFLAGS@ +WIDLFLAGS = @WIDLFLAGS@ LIBS = @LIBS@ BISON = @BISON@ FLEX = @FLEX@ diff --git a/configure b/configure index e0c8001..969396a 100755 --- a/configure +++ b/configure @@ -764,6 +764,7 @@ BISON FLEX TOOLSDIR wine64_disable +WIDLFLAGS TARGETFLAGS LD CPPBIN @@ -5509,6 +5510,8 @@ rm -f core conftest.err conftest.$ac_objext \ notice_platform="32-bit " TARGETFLAGS="-m32" + WIDLFLAGS="--win32" + PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} @@ -5544,6 +5547,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext notice_platform="64-bit " TARGETFLAGS="-m64" + WIDLFLAGS="--win64" + fi ;; arm*) @@ -5612,6 +5617,8 @@ rm -f core conftest.err conftest.$ac_objext \ CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi" TARGETFLAGS="-marm -mfloat-abi=$float_abi" + WIDLFLAGS="--win32" + ;; aarch64*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports __builtin_ms_va_list" >&5 @@ -5636,9 +5643,13 @@ $as_echo "no" >&6; } as_fn_error $? "You need clang >= 5.0 to build Wine for arm64." "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + WIDLFLAGS="--win64" + ;; i[3456789]86*) enable_win16=${enable_win16:-yes} + WIDLFLAGS="--win32" + ;; esac diff --git a/configure.ac b/configure.ac index a7e3ba5..f5c08b7 100644 --- a/configure.ac +++ b/configure.ac @@ -157,6 +157,7 @@ case $host in host_cpu="i386" notice_platform="32-bit " AC_SUBST(TARGETFLAGS,"-m32") + AC_SUBST(WIDLFLAGS,"--win32") PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} @@ -174,6 +175,7 @@ case $host in host_cpu="x86_64" notice_platform="64-bit " AC_SUBST(TARGETFLAGS,"-m64") + AC_SUBST(WIDLFLAGS,"--win64") fi ;; arm*) @@ -205,6 +207,7 @@ case $host in esac CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi" AC_SUBST(TARGETFLAGS,"-marm -mfloat-abi=$float_abi") + AC_SUBST(WIDLFLAGS,"--win32") ;; aarch64*) AC_MSG_CHECKING([whether $CC supports __builtin_ms_va_list]) @@ -212,9 +215,11 @@ case $host in [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) AC_MSG_ERROR([You need clang >= 5.0 to build Wine for arm64.])]) + AC_SUBST(WIDLFLAGS,"--win64") ;; i[[3456789]]86*) enable_win16=${enable_win16:-yes} + AC_SUBST(WIDLFLAGS,"--win32") ;; esac diff --git a/tools/makedep.c b/tools/makedep.c index 4fcc99e..66b21db 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -133,6 +133,7 @@ static struct strarray msvcrt_flags; static struct strarray extra_cflags; static struct strarray cpp_flags; static struct strarray unwind_flags; +static struct strarray widl_flags; static struct strarray libs; static struct strarray enable_tests; static struct strarray cmdline_vars; @@ -2641,6 +2642,7 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, output_filenames_obj_dir( make, targets ); output( ": %s\n", tools_path( make, "widl" )); output( "\t%s -o $@", tools_path( make, "widl" ) ); + output_filenames( widl_flags ); output_filenames( target_flags ); output_filenames( make->include_args ); output_filenames( make->define_args ); @@ -4208,6 +4210,7 @@ int main( int argc, char *argv[] ) extra_cflags = get_expanded_make_var_array( top_makefile, "EXTRACFLAGS" ); cpp_flags = get_expanded_make_var_array( top_makefile, "CPPFLAGS" ); unwind_flags = get_expanded_make_var_array( top_makefile, "UNWINDFLAGS" ); + widl_flags = get_expanded_make_var_array( top_makefile, "WIDLFLAGS" ); libs = get_expanded_make_var_array( top_makefile, "LIBS" ); enable_tests = get_expanded_make_var_array( top_makefile, "ENABLE_TESTS" );

1 0

Zebediah Figura : devenum: Zero-initialize REGFILTERPINS struct.
by Alexandre Julliard 04 Oct '18

04 Oct '18

Module: wine Branch: master Commit: cea76150385b0d3e380fdd4e0d6ab8042bb48989 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cea76150385b0d3e380fdd4e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 3 22:41:02 2018 -0500 devenum: Zero-initialize REGFILTERPINS struct. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45923 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index e44e6ec..8a3160c 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -778,7 +778,7 @@ static void register_avicap_devices(void) WCHAR friendlyname[] = {'v','i','d','e','o','0',0}; IPropertyBag *prop_bag = NULL; WCHAR name[32], version[32]; - REGFILTERPINS2 rgpins; + REGFILTERPINS2 rgpins = {0}; REGPINTYPES rgtypes; REGFILTER2 rgf; VARIANT var;

1 0

Andrew Wesie : wined3d: Add fast-path for texture download blit.
by Alexandre Julliard 04 Oct '18

04 Oct '18

Module: wine Branch: master Commit: 54a9e84952ce8f566f79ab92930faf84bad0cfc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54a9e84952ce8f566f79ab92… Author: Andrew Wesie <awesie(a)gmail.com> Date: Thu Oct 4 01:16:44 2018 -0500 wined3d: Add fast-path for texture download blit. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 28 +++++++++++++++++++++++++--- dlls/wined3d/texture.c | 22 ++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4942177..71693ad 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3257,6 +3257,29 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ return WINED3D_OK; } } + else if (!(src_sub_resource->locations & surface_simple_locations) + && (dst_sub_resource->locations & dst_texture->resource.map_binding)) + { + /* Download */ + if (scale) + TRACE("Not doing download because of scaling.\n"); + else if (convert) + TRACE("Not doing download because of format conversion.\n"); + else if (src_texture->resource.format->conv_byte_count) + TRACE("Not doing download because the source format needs conversion.\n"); + else if (is_multisample_location(src_texture, WINED3D_LOCATION_TEXTURE_RGB)) + TRACE("Not doing download because of multisample source.\n"); + else if (!texture2d_is_full_rect(src_texture, src_sub_resource_idx % src_texture->level_count, &src_rect)) + TRACE("Not doing download because of partial download (src).\n"); + else if (!texture2d_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_rect)) + TRACE("Not doing download because of partial download (dst).\n"); + else + { + wined3d_texture_download_from_texture(dst_texture, dst_sub_resource_idx, src_texture, + src_sub_resource_idx); + return WINED3D_OK; + } + } else if (dst_swapchain && dst_swapchain->back_buffers && dst_texture == dst_swapchain->front_buffer && src_texture == dst_swapchain->back_buffers[0]) @@ -3280,10 +3303,9 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ return WINED3D_OK; } - else if ((flags & WINED3D_BLT_RAW) || (!scale && !convert && !resolve)) - { + + if ((flags & WINED3D_BLT_RAW) || (blit_op == WINED3D_BLIT_OP_COLOR_BLIT && !scale && !convert && !resolve)) blit_op = WINED3D_BLIT_OP_RAW_BLIT; - } if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU) dst_location = dst_texture->resource.draw_binding; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0b11c94..400d367 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3806,3 +3806,25 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); } + +/* Partial downloads are not supported. */ +void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx) +{ + struct wined3d_context *context; + struct wined3d_bo_address data; + DWORD dst_location = dst_texture->resource.map_binding; + + context = context_acquire(src_texture->resource.device, NULL, 0); + + wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); + wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &data, dst_location); + wined3d_texture_bind_and_dirtify(src_texture, context, + !(src_texture->sub_resources[src_sub_resource_idx].locations & WINED3D_LOCATION_TEXTURE_RGB)); + wined3d_texture_download_data(src_texture, src_sub_resource_idx, context, &data); + + context_release(context); + + wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, dst_location); + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~dst_location); +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fadb607..9baefa6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3349,6 +3349,8 @@ HRESULT wined3d_texture_check_box_dimensions(const struct wined3d_texture *textu unsigned int level, const struct wined3d_box *box) DECLSPEC_HIDDEN; void wined3d_texture_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, const struct wined3d_bo_address *data) DECLSPEC_HIDDEN; +void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx) DECLSPEC_HIDDEN; GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_bo_address *data, DWORD locations) DECLSPEC_HIDDEN;

1 0