wine-commits October 2018

wine-commits@winehq.org

1 participants
602 discussions

Józef Kucia : Release 1.1.
by Alexandre Julliard 05 Oct '18

05 Oct '18

Module: vkd3d Branch: master Commit: ecda316ef54d70bf1b3e860755241bb75873e53f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ecda316ef54d70bf1b3e860… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 5 18:26:13 2018 +0200 Release 1.1. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 105 ++++++++++++++++++++++++++++------------------------------- AUTHORS | 1 + configure.ac | 2 +- 3 files changed, 52 insertions(+), 56 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 8c2c1de..89a4b40 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,16 +1,16 @@ -The Wine team is proud to announce that release 1.0 of vkd3d, the +The Wine team is proud to announce that release 1.1 of vkd3d, the Direct3D 12 to Vulkan translation library, is now available. -This is the first release of vkd3d. A lot of Direct3D 12 features are still -missing and bugs are expected. The current version was tested mainly with demo -applications. A number of features that are being worked on have been deferred -to the next development cycle. This includes in particular geometry and -tessellation shaders support, various shader translation improvements, as well -as various improvements for core Direct3D 12 methods. +This release contains improvements that are listed in the release notes below. +The main highlights are: + + - Initial support for placed resources. + - MoltenVK support. + - Support for geometry shaders. The source is available from the following location: - https://dl.winehq.org/vkd3d/source/vkd3d-1.0.tar.xz + https://dl.winehq.org/vkd3d/source/vkd3d-1.1.tar.xz The current source can also be pulled directly from the git repository: @@ -21,70 +21,65 @@ for the complete list. ---------------------------------------------------------------- -What's included in vkd3d 1.0 -============================ +What's new in vkd3d 1.1 +======================= *** libvkd3d -- libvkd3d is the main component of the vkd3d project. It's a 3D graphics - library built on top of Vulkan with an API very similar to Direct3D 12. - -- A significant number of Direct3D 12 features are implemented, including: - - Graphics and compute pipelines. - - Command lists, command allocators and command queues. - - Descriptors and descriptor heaps. - - Root signatures. - - Constant buffer, shader resource, unordered access, render target and depth - stencil views. - - Samplers. - - Static samplers. - - Descriptors copying. - - Committed resources. - - Fences. - - Queries and query heaps. - - Resource barriers. - - Root constants. - - Basic support for indirect draws and dispatches. - - Basic support for command signatures. - - Various Clear*() methods. - - Various Copy*() methods. +- Initial support for memory heaps and placed resources. + +- Improved support for resource views. + +- ClearUnorderedAccessViewUint() is implemented for textures. + +- Blend factor is implemented. + +- Performance improvements. + +- A new interface is available for enabling additional Vulkan instance + extensions. + +- A new public function is available for mapping VkFormats to DXGI_FORMATs. + +- Support for more DXGI formats. + +- Various bug fixes. *** libvkd3d-shader -- libvkd3d-shader is a library which translates shader model 4 and 5 bytecode - to SPIR-V. In this release, libvkd3d-shader is an internal library. Its API - isn't set in stone yet. +- Support for geometry shaders. -- Vertex, pixel and compute shaders are supported. Also, very simple geometry - shaders should be translated correctly. Issues are expected when trying to - translate tessellation shaders or more complex geometry shaders. +- Pretty printing is implemented for shader code extracted from DXBC. -- A significant number of shader instructions are supported in this release, - including: - - Arithmetic instructions. - - Bit instructions. - - Comparison instructions. - - Control flow instructions. - - Sample, gather and load instructions. - - Atomic instructions. - - UAV instructions. +- Clip and cull distances are supported. -- Root signature serialization and deserialization is implemented. +- Support for more shader instructions: + - round_ne, + - sincos, + - ineg, + - continue, + - continuec, + - gather4_po, + - gather4_po_c, + - gather4_c. -- Shader model 4 and 5 bytecode parser is imported from wined3d. +- Texel offsets are supported. -- Shader model 5.1 is not supported yet. +- Various shader translation fixes. *** libvkd3d-utils -- libvkd3d-utils contains simple implementations of various functions which - might be useful for source ports of Direct3D 12 applications. +- Vulkan WSI extensions are detected at runtime. + + +*** build + +- Demos are not built by default. +- libxcb is now an optional dependency required only for demos. -*** demos +- MoltenVK is supported. -- A simple hello triangle Direct3D 12 demo. -- A Direct3D 12 port of glxgears. diff --git a/AUTHORS b/AUTHORS index 1991bdf..c15cb6a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,4 @@ +Chip Davis Henri Verbeet Józef Kucia Sven Hesse diff --git a/configure.ac b/configure.ac index ada7e9a..58672c5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([vkd3d],[1.0]) +AC_INIT([vkd3d],[1.1]) AC_CONFIG_AUX_DIR([bin]) AC_CONFIG_MACRO_DIR([m4])

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

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

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: 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

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

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

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

Bernhard Übelacker : user32: Let nulldrv return some dummy monitor information.
by Alexandre Julliard 04 Oct '18

04 Oct '18

Module: wine Branch: master Commit: f5bb76f69a96e2b5a5b0953817035a8cbe94153a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5bb76f69a96e2b5a5b09538… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Tue Oct 2 16:27:41 2018 +0200 user32: Let nulldrv return some dummy monitor information. 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> --- dlls/user32/driver.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 561a126..5b29292 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -197,6 +197,8 @@ void USER_unload_driver(void) * These are fallbacks for entry points that are not implemented in the real driver. */ +#define NULLDRV_DEFAULT_HMONITOR ((HMONITOR)(UINT_PTR)(0x10000 + 1)) + static HKL CDECL nulldrv_ActivateKeyboardLayout( HKL layout, UINT flags ) { return 0; @@ -354,7 +356,12 @@ static LONG CDECL nulldrv_ChangeDisplaySettingsEx( LPCWSTR name, LPDEVMODEW mode static BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { - return FALSE; + RECT r = {0, 0, 640, 480}; + + TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); + + proc(NULLDRV_DEFAULT_HMONITOR, hdc, &r, lp); + return TRUE; } static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVMODEW mode, DWORD flags ) @@ -364,7 +371,23 @@ static BOOL CDECL nulldrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDEVM static BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) { - return FALSE; + RECT r = {0, 0, 640, 480}; + static const WCHAR device[] = {'W','i','n','D','i','s','c',0}; + + TRACE("(%p, %p)\n", handle, info); + + if (handle != NULLDRV_DEFAULT_HMONITOR) + { + SetLastError(ERROR_INVALID_MONITOR_HANDLE); + return FALSE; + } + + info->rcMonitor = r; + info->rcWork = r; + info->dwFlags = MONITORINFOF_PRIMARY; + if (info->cbSize >= sizeof(MONITORINFOEXW)) + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, device ); + return TRUE; } static BOOL CDECL nulldrv_CreateDesktopWindow( HWND hwnd )

1 0

Hans Leidekker : winhttp: Implement the WINHTTP_FLAG_ESCAPE_* flags.
by Alexandre Julliard 04 Oct '18

04 Oct '18

Module: wine Branch: master Commit: ace7f05672d9759bdde842b74deddea6caf0f012 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ace7f05672d9759bdde842b7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 4 10:32:01 2018 +0200 winhttp: Implement the WINHTTP_FLAG_ESCAPE_* flags. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42677 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 12 ++-- dlls/winhttp/session.c | 67 +++++++++++++++------- dlls/winhttp/tests/url.c | 29 +++++++++- dlls/winhttp/tests/winhttp.c | 60 +++++++++++++++----- dlls/winhttp/url.c | 122 +++++++++++++++++------------------------ dlls/winhttp/winhttp_private.h | 10 +++- 6 files changed, 188 insertions(+), 112 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ace7f05672d9759bdde8…

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2018