October 2017 - Wine-commits

Vincent Povirk : gdiplus/tests: Add tests for gdi32 transform and clip caching.
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: wine Branch: master Commit: 2ea6c93bc419eab03921b48896b9985daea7b8bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea6c93bc419eab03921b4889… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 4 14:54:19 2017 -0500 gdiplus/tests: Add tests for gdi32 transform and clip caching. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 70 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 956ddb0..a96050b 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -6569,6 +6569,75 @@ static void test_cliphrgn_transform(void) ReleaseDC(hwnd, hdc); } +static void test_hdc_caching(void) +{ + GpStatus status; + HDC hdc; + HBITMAP hbm; + GpGraphics *graphics; + ULONG *bits; + BITMAPINFO bmi; + HRGN hrgn; + GpBrush *brush; + + hdc = CreateCompatibleDC(0); + ok(hdc != NULL, "CreateCompatibleDC failed\n"); + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biHeight = -5; + bmi.bmiHeader.biWidth = 5; + bmi.bmiHeader.biBitCount = 32; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biCompression = BI_RGB; + bmi.bmiHeader.biClrUsed = 0; + + hbm = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(hbm != NULL, "CreateDIBSection failed\n"); + + SelectObject(hdc, hbm); + + SetViewportOrgEx(hdc, 1, 1, NULL); + + hrgn = CreateRectRgn(0, 0, 3, 3); + SelectClipRgn(hdc, hrgn); + DeleteObject(hrgn); + + status = GdipCreateSolidFill((ARGB)0xffaaaaaa, (GpSolidFill**)&brush); + expect(Ok, status); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + memset(bits, 0, sizeof(*bits) * 25); + status = GdipFillRectangleI(graphics, brush, 0, 0, 4, 4); + expect(Ok, status); + + expect(0, bits[0]); + expect(0xffaaaaaa, bits[6]); + expect(0xffaaaaaa, bits[12]); + expect(0, bits[18]); + expect(0, bits[24]); + + SetViewportOrgEx(hdc, 0, 0, NULL); + OffsetClipRgn(hdc, 2, 2); + + memset(bits, 0, sizeof(*bits) * 25); + status = GdipFillRectangleI(graphics, brush, 0, 0, 4, 4); + expect(Ok, status); + + expect(0, bits[0]); + expect(0xffaaaaaa, bits[6]); + expect(0xffaaaaaa, bits[12]); + expect(0, bits[18]); + expect(0, bits[24]); + + GdipDeleteGraphics(graphics); + + GdipDeleteBrush(brush); + + DeleteDC(hdc); + DeleteObject(hbm); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -6659,6 +6728,7 @@ START_TEST(graphics) test_container_rects(); test_GdipGraphicsSetAbort(); test_cliphrgn_transform(); + test_hdc_caching(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

Louis Lenders : ntdll: Add stub for RtlGetUnloadEventTrace.
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: wine Branch: master Commit: 9a53298eed493080fb132d0cd57fffa95b00b1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a53298eed493080fb132d0cd… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Oct 4 12:17:03 2017 +0200 ntdll: Add stub for RtlGetUnloadEventTrace. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ab801ac..50f4acf 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -669,7 +669,7 @@ # @ stub RtlGetSecurityDescriptorRMControl # @ stub RtlGetSetBootStatusData @ stdcall RtlGetThreadErrorMode() -# @ stub RtlGetUnloadEventTrace +@ stdcall RtlGetUnloadEventTrace() @ stub RtlGetUserInfoHeap @ stdcall RtlGetVersion(ptr) @ stub RtlGuidToPropertySetName diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 8630dde..09a9c92 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1653,3 +1653,22 @@ NTSTATUS WINAPI RtlCreateUserProcess(UNICODE_STRING *path, ULONG attributes, RTL parent, inherit, debug, exception, info); return STATUS_NOT_IMPLEMENTED; } + +typedef struct _RTL_UNLOAD_EVENT_TRACE +{ + PVOID BaseAddress; + SIZE_T SizeOfImage; + ULONG Sequence; + ULONG TimeDateStamp; + ULONG CheckSum; + WCHAR ImageName[32]; +} RTL_UNLOAD_EVENT_TRACE, *PRTL_UNLOAD_EVENT_TRACE; + +/********************************************************************* + * RtlGetUnloadEventTrace [NTDLL.@] + */ +RTL_UNLOAD_EVENT_TRACE * WINAPI RtlGetUnloadEventTrace(void) +{ + FIXME("stub!\n"); + return NULL; +}

1 0

Alexandre Julliard : server: Add a separate object to store the PE shared mapping file.
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: wine Branch: master Commit: 71903899aa620e958de42e63f8d0fe51abd5a321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71903899aa620e958de42e63f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 4 10:06:14 2017 +0200 server: Add a separate object to store the PE shared mapping file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mapping.c | 100 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 74 insertions(+), 26 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 096c15e..57bf716 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -81,6 +81,42 @@ static const struct object_ops ranges_ops = ranges_destroy /* destroy */ }; +/* file backing the shared sections of a PE image mapping */ +struct shared_map +{ + struct object obj; /* object header */ + struct fd *fd; /* file descriptor of the mapped PE file */ + struct file *file; /* temp file holding the shared data */ + struct list entry; /* entry in global shared maps list */ +}; + +static void shared_map_dump( struct object *obj, int verbose ); +static void shared_map_destroy( struct object *obj ); + +static const struct object_ops shared_map_ops = +{ + sizeof(struct shared_map), /* size */ + shared_map_dump, /* dump */ + no_get_type, /* get_type */ + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + NULL, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ + no_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + no_lookup_name, /* lookup_name */ + no_link_name, /* link_name */ + NULL, /* unlink_name */ + no_open_file, /* open_file */ + no_close_handle, /* close_handle */ + shared_map_destroy /* destroy */ +}; + +static struct list shared_map_list = LIST_INIT( shared_map_list ); + /* memory view mapped in client address space */ struct memory_view { @@ -102,8 +138,7 @@ struct mapping enum cpu_type cpu; /* client CPU (for PE image mapping) */ pe_image_info_t image; /* image info (for PE image mapping) */ struct ranges *committed; /* list of committed ranges in this mapping */ - struct file *shared_file; /* temp file for shared PE mapping */ - struct list shared_entry; /* entry in global shared PE mappings list */ + struct shared_map *shared; /* temp file for shared PE mapping */ }; static void mapping_dump( struct object *obj, int verbose ); @@ -149,8 +184,6 @@ static const struct fd_ops mapping_fd_ops = default_fd_reselect_async /* reselect_async */ }; -static struct list shared_list = LIST_INIT(shared_list); - static size_t page_mask; #define ROUND_SIZE(size) (((size) + page_mask) & ~page_mask) @@ -168,6 +201,21 @@ static void ranges_destroy( struct object *obj ) free( ranges->ranges ); } +static void shared_map_dump( struct object *obj, int verbose ) +{ + struct shared_map *shared = (struct shared_map *)obj; + fprintf( stderr, "Shared mapping fd=%p file=%p\n", shared->fd, shared->file ); +} + +static void shared_map_destroy( struct object *obj ) +{ + struct shared_map *shared = (struct shared_map *)obj; + + release_object( shared->fd ); + release_object( shared->file ); + list_remove( &shared->entry ); +} + /* extend a file beyond the current end of file */ static int grow_file( int unix_fd, file_pos_t new_size ) { @@ -277,13 +325,13 @@ void free_mapped_views( struct process *process ) } /* find the shared PE mapping for a given mapping */ -static struct file *get_shared_file( struct mapping *mapping ) +static struct shared_map *get_shared_file( struct fd *fd ) { - struct mapping *ptr; + struct shared_map *ptr; - LIST_FOR_EACH_ENTRY( ptr, &shared_list, struct mapping, shared_entry ) - if (is_same_file_fd( ptr->fd, mapping->fd )) - return (struct file *)grab_object( ptr->shared_file ); + LIST_FOR_EACH_ENTRY( ptr, &shared_map_list, struct shared_map, entry ) + if (is_same_file_fd( ptr->fd, fd )) + return (struct shared_map *)grab_object( ptr ); return NULL; } @@ -397,6 +445,8 @@ static int find_committed_range( struct memory_view *view, file_pos_t start, mem static int build_shared_mapping( struct mapping *mapping, int fd, IMAGE_SECTION_HEADER *sec, unsigned int nb_sec ) { + struct shared_map *shared; + struct file *file; unsigned int i; mem_size_t total_size; size_t file_size, map_size, max_size; @@ -420,13 +470,12 @@ static int build_shared_mapping( struct mapping *mapping, int fd, } if (!total_size) return 1; /* nothing to do */ - if ((mapping->shared_file = get_shared_file( mapping ))) return 1; + if ((mapping->shared = get_shared_file( mapping->fd ))) return 1; /* create a temp file for the mapping */ if ((shared_fd = create_temp_file( total_size )) == -1) return 0; - if (!(mapping->shared_file = create_file_for_fd( shared_fd, FILE_GENERIC_READ|FILE_GENERIC_WRITE, 0 ))) - return 0; + if (!(file = create_file_for_fd( shared_fd, FILE_GENERIC_READ|FILE_GENERIC_WRITE, 0 ))) return 0; if (!(buffer = malloc( max_size ))) goto error; @@ -457,11 +506,16 @@ static int build_shared_mapping( struct mapping *mapping, int fd, if (pwrite( shared_fd, buffer, file_size, write_pos ) != file_size) goto error; } free( buffer ); + + if (!(shared = alloc_object( &shared_map_ops ))) goto error; + shared->fd = (struct fd *)grab_object( mapping->fd ); + shared->file = file; + list_add_head( &shared_map_list, &shared->entry ); + mapping->shared = shared; return 1; error: - release_object( mapping->shared_file ); - mapping->shared_file = NULL; + release_object( file ); free( buffer ); return 0; } @@ -583,8 +637,6 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s if (!build_shared_mapping( mapping, unix_fd, sec, nt.FileHeader.NumberOfSections )) goto error; - if (mapping->shared_file) list_add_head( &shared_list, &mapping->shared_entry ); - free( sec ); return 0; @@ -650,7 +702,7 @@ static struct object *create_mapping( struct object *root, const struct unicode_ mapping->size = size; mapping->fd = NULL; - mapping->shared_file = NULL; + mapping->shared = NULL; mapping->committed = NULL; if (!(mapping->flags = get_mapping_flags( handle, flags ))) goto error; @@ -747,9 +799,9 @@ static void mapping_dump( struct object *obj, int verbose ) { struct mapping *mapping = (struct mapping *)obj; assert( obj->ops == &mapping_ops ); - fprintf( stderr, "Mapping size=%08x%08x flags=%08x fd=%p shared_file=%p\n", + fprintf( stderr, "Mapping size=%08x%08x flags=%08x fd=%p shared=%p\n", (unsigned int)(mapping->size >> 32), (unsigned int)mapping->size, - mapping->flags, mapping->fd, mapping->shared_file ); + mapping->flags, mapping->fd, mapping->shared ); } static struct object_type *mapping_get_type( struct object *obj ) @@ -780,11 +832,7 @@ static void mapping_destroy( struct object *obj ) assert( obj->ops == &mapping_ops ); if (mapping->fd) release_object( mapping->fd ); if (mapping->committed) release_object( mapping->committed ); - if (mapping->shared_file) - { - release_object( mapping->shared_file ); - list_remove( &mapping->shared_entry ); - } + if (mapping->shared) release_object( mapping->shared ); } static enum server_fd_type mapping_get_fd_type( struct fd *fd ) @@ -857,8 +905,8 @@ DECL_HANDLER(get_mapping_info) return; } - if (mapping->shared_file) - reply->shared_file = alloc_handle( current->process, mapping->shared_file, + if (mapping->shared) + reply->shared_file = alloc_handle( current->process, mapping->shared->file, GENERIC_READ|GENERIC_WRITE, 0 ); release_object( mapping ); }

1 0

Alexandre Julliard : server: Keep a reference to the shared PE mapping in mapped views.
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: wine Branch: master Commit: 8c944f7a9d202be199ff2804e0236120fca9e95b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c944f7a9d202be199ff2804e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 4 10:08:31 2017 +0200 server: Keep a reference to the shared PE mapping in mapped views. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mapping.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/mapping.c b/server/mapping.c index 57bf716..f9f50ed 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -123,6 +123,7 @@ struct memory_view struct list entry; /* entry in per-process view list */ struct fd *fd; /* fd for mapped file */ struct ranges *committed; /* list of committed ranges in this mapping */ + struct shared_map *shared; /* temp file for shared PE mapping */ unsigned int flags; /* SEC_* flags */ client_ptr_t base; /* view base address (in process addr space) */ mem_size_t size; /* view size */ @@ -311,6 +312,7 @@ static void free_memory_view( struct memory_view *view ) { if (view->fd) release_object( view->fd ); if (view->committed) release_object( view->committed ); + if (view->shared) release_object( view->shared ); list_remove( &view->entry ); free( view ); } @@ -958,6 +960,7 @@ DECL_HANDLER(map_view) view->flags = mapping->flags; view->fd = !is_fd_removable( mapping->fd ) ? (struct fd *)grab_object( mapping->fd ) : NULL; view->committed = mapping->committed ? (struct ranges *)grab_object( mapping->committed ) : NULL; + view->shared = mapping->shared ? (struct shared_map *)grab_object( mapping->shared ) : NULL; list_add_tail( &current->process->views, &view->entry ); }

1 0

Fabian Maurer : riched20: In ME_ProtectPartialTableDeletion properly set out parameter (cppcheck).
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: wine Branch: master Commit: 6d62904497e81e167f1b916a5c7ee3ca0fd3c4c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d62904497e81e167f1b916a5… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Oct 3 17:31:11 2017 +0200 riched20: In ME_ProtectPartialTableDeletion properly set out parameter (cppcheck). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index b834bc7..d2cab9a 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -400,7 +400,7 @@ void ME_ProtectPartialTableDeletion(ME_TextEditor *editor, ME_Cursor *c, int *nC } } if (*nChars < 0) - nChars = 0; + *nChars = 0; } }

1 0

Alistair Leslie-Hughes : oleaut32/tests: Add VarDateFromStr test.
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: wine Branch: master Commit: 884c6ddd516478a94cd4e42ff5510ad226e69bde URL: http://source.winehq.org/git/wine.git/?a=commit;h=884c6ddd516478a94cd4e42ff… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 4 04:40:22 2017 +0000 oleaut32/tests: Add VarDateFromStr test. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index a6f9ae5..be6ec91 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3109,6 +3109,8 @@ static void test_VarDateFromStr(void) DFS("6/30/2011 01:20:34"); EXPECT_DBL(40724.05594907407); DFS("6/30/2011 01:20:34 AM"); EXPECT_DBL(40724.05594907407); DFS("6/30/2011 01:20:34 PM"); EXPECT_DBL(40724.55594907407); + DFS("2013-05-14 02:04:12"); EXPECT_DBL(41408.08625000001); + DFS("2013-05-14 02:04:12.017000000"); EXPECT_MISMATCH; /* Native fails "1999 January 3, 9AM". I consider that a bug in native */ /* test a data with ideographic space */

1 0

Alexandre Julliard : configure: Add pkg-config support for libcups.
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: wine Branch: master Commit: 378931f85e5781c71b698399dc81284e75685cac URL: http://source.winehq.org/git/wine.git/?a=commit;h=378931f85e5781c71b698399d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 4 16:45:44 2017 +0200 configure: Add pkg-config support for libcups. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 74 ++++++++++++++++++++++++++++++++++++------------------------ configure.ac | 22 +++++++++--------- 2 files changed, 56 insertions(+), 40 deletions(-) diff --git a/configure b/configure index 74fd4d4..095aa39 100755 --- a/configure +++ b/configure @@ -650,6 +650,7 @@ JPEG_LIBS JPEG_CFLAGS FONTCONFIG_LIBS FONTCONFIG_CFLAGS +CUPS_LIBS CUPS_CFLAGS CAPI20_LIBS CAPI20_CFLAGS @@ -1714,6 +1715,8 @@ UDEV_CFLAGS UDEV_LIBS CAPI20_CFLAGS CAPI20_LIBS +CUPS_CFLAGS +CUPS_LIBS FONTCONFIG_CFLAGS FONTCONFIG_LIBS JPEG_CFLAGS @@ -2473,6 +2476,8 @@ Some influential environment variables: CAPI20_CFLAGS C compiler flags for capi20, overriding pkg-config CAPI20_LIBS Linker flags for capi20, overriding pkg-config + CUPS_CFLAGS C compiler flags for cups, overriding pkg-config + CUPS_LIBS Linker flags for cups, overriding pkg-config FONTCONFIG_CFLAGS C compiler flags for fontconfig, overriding pkg-config FONTCONFIG_LIBS @@ -13446,28 +13451,47 @@ esac fi -CUPS_CFLAGS="" - if test "x$with_cups" != "xno" then - ac_save_CPPFLAGS="$CPPFLAGS" - ac_cups_cflags=`${CUPS_CONFIG:-cups-config} --cflags 2>/dev/null` - ac_cups_libs=`${CUPS_CONFIG:-cups-config} --ldflags 2>/dev/null` - CPPFLAGS="$CPPFLAGS $ac_cups_cflags" - for ac_header in cups/cups.h + if ${CUPS_CFLAGS:+false} :; then : + if ${PKG_CONFIG+:} false; then : + CUPS_CFLAGS=`$PKG_CONFIG --cflags cups 2>/dev/null` +fi +fi +test "$cross_compiling" = yes || CUPS_CFLAGS=${CUPS_CFLAGS:-`${CUPS_CONFIG:-cups-config} --cflags 2>/dev/null`} +if ${CUPS_LIBS:+false} :; then : + if ${PKG_CONFIG+:} false; then : + CUPS_LIBS=`$PKG_CONFIG --libs cups 2>/dev/null` +fi +fi +test "$cross_compiling" = yes || CUPS_LIBS=${CUPS_LIBS:-`${CUPS_CONFIG:-cups-config} --libs 2>/dev/null`} +CUPS_LIBS=${CUPS_LIBS:-"-lcups"} +$as_echo "$as_me:${as_lineno-$LINENO}: cups cflags: $CUPS_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: cups libs: $CUPS_LIBS" >&5 +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $CUPS_CFLAGS" +for ac_header in cups/cups.h cups/ppd.h do : - ac_fn_c_check_header_mongrel "$LINENO" "cups/cups.h" "ac_cv_header_cups_cups_h" "$ac_includes_default" -if test "x$ac_cv_header_cups_cups_h" = xyes; then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define HAVE_CUPS_CUPS_H 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lcups" >&5 + +fi + +done + + if test "$ac_cv_header_cups_cups_h" = "yes" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lcups" >&5 $as_echo_n "checking for -lcups... " >&6; } if ${ac_cv_lib_soname_cups+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lcups $ac_cups_libs $LIBS" +LIBS="-lcups $CUPS_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13503,7 +13527,7 @@ fi if ${ac_cv_lib_soname_cups:+false} :; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - + CUPS_LIBS="" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_cups" >&5 $as_echo "$ac_cv_lib_soname_cups" >&6; } @@ -13512,25 +13536,16 @@ cat >>confdefs.h <<_ACEOF #define SONAME_LIBCUPS "$ac_cv_lib_soname_cups" _ACEOF - CUPS_CFLAGS="$ac_cups_cflags" -fi - for ac_header in cups/ppd.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "cups/ppd.h" "ac_cv_header_cups_ppd_h" "$ac_includes_default" -if test "x$ac_cv_header_cups_ppd_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_CUPS_PPD_H 1 -_ACEOF - -fi - -done fi + else + CUPS_CFLAGS="" + CUPS_LIBS="" + fi +CPPFLAGS=$ac_save_CPPFLAGS +test -z "$CUPS_CFLAGS" || CUPS_CFLAGS=`echo " $CUPS_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$CUPS_LIBS" || CUPS_LIBS=`echo " $CUPS_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` -done - - CPPFLAGS="$ac_save_CPPFLAGS" fi if test "x$ac_cv_lib_soname_cups" = "x"; then : case "x$with_cups" in @@ -17883,6 +17898,7 @@ UDEV_LIBS = $UDEV_LIBS CAPI20_CFLAGS = $CAPI20_CFLAGS CAPI20_LIBS = $CAPI20_LIBS CUPS_CFLAGS = $CUPS_CFLAGS +CUPS_LIBS = $CUPS_LIBS FONTCONFIG_CFLAGS = $FONTCONFIG_CFLAGS FONTCONFIG_LIBS = $FONTCONFIG_LIBS JPEG_CFLAGS = $JPEG_CFLAGS diff --git a/configure.ac b/configure.ac index 2f6922f..44c7eed 100644 --- a/configure.ac +++ b/configure.ac @@ -1585,19 +1585,19 @@ WINE_NOTICE_WITH(capi,[test "x$ac_cv_lib_soname_capi20" = "x"], [libcapi20 ${notice_platform}development files not found, ISDN won't be supported.]) dnl **** Check for cups **** -AC_SUBST(CUPS_CFLAGS,"") if test "x$with_cups" != "xno" then - ac_save_CPPFLAGS="$CPPFLAGS" - ac_cups_cflags=`${CUPS_CONFIG:-cups-config} --cflags 2>/dev/null` - ac_cups_libs=`${CUPS_CONFIG:-cups-config} --ldflags 2>/dev/null` - CPPFLAGS="$CPPFLAGS $ac_cups_cflags" - AC_CHECK_HEADERS(cups/cups.h, - [WINE_CHECK_SONAME(cups,cupsGetDefault, - [CUPS_CFLAGS="$ac_cups_cflags"],, - [$ac_cups_libs]) - AC_CHECK_HEADERS(cups/ppd.h)]) - CPPFLAGS="$ac_save_CPPFLAGS" + WINE_PACKAGE_FLAGS(CUPS,[cups],[-lcups], + [`${CUPS_CONFIG:-cups-config} --cflags 2>/dev/null`], + [`${CUPS_CONFIG:-cups-config} --libs 2>/dev/null`], + [AC_CHECK_HEADERS(cups/cups.h cups/ppd.h) + if test "$ac_cv_header_cups_cups_h" = "yes" + then + WINE_CHECK_SONAME(cups,cupsGetDefault,,[CUPS_LIBS=""],[$CUPS_LIBS]) + else + CUPS_CFLAGS="" + CUPS_LIBS="" + fi]) fi WINE_NOTICE_WITH(cups,[test "x$ac_cv_lib_soname_cups" = "x"], [libcups ${notice_platform}development files not found, CUPS won't be supported.])

1 0

Piotr Caban : msvcp140: Skip _Reschedule_chore tests when CreateThreadpoolWork is not available.
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: wine Branch: master Commit: e3af73716bb69269f818413333eae3322d1b7e60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3af73716bb69269f81841333… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 4 15:39:03 2017 +0200 msvcp140: Skip _Reschedule_chore tests when CreateThreadpoolWork is not available. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 8252865..9b1d7b1 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -487,6 +487,14 @@ static void test_chore(void) wait = WaitForSingleObject(event, 500); ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait); + if(!GetProcAddress(GetModuleHandleA("kernel32"), "CreateThreadpoolWork")) + { + win_skip("_Reschedule_chore not supported\n"); + p__Release_chore(&chore); + CloseHandle(event); + return; + } + old_chore = chore; ret = p__Schedule_chore(&chore); ok(!ret, "_Schedule_chore returned %d\n", ret); @@ -505,6 +513,8 @@ static void test_chore(void) ok(chore.callback == chore_callback, "chore.callback = %p, expected %p\n", chore.callback, chore_callback); ok(chore.arg == event, "chore.arg = %p, expected %p\n", chore.arg, event); p__Release_chore(&chore); + + CloseHandle(event); } static void test_to_byte(void)

1 0

Hans Leidekker : msi: Fix an invalid write in build_default_format ( Valgrind).
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: wine Branch: master Commit: f517022ecc8dfd23486b4cdc32343323ffd9ec9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f517022ecc8dfd23486b4cdc3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 4 16:49:41 2017 +0200 msi: Fix an invalid write in build_default_format (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/format.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 108b28d..3bcd0b8 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -339,29 +339,28 @@ static WCHAR *deformat_literal( FORMAT *format, FORMSTR *str, BOOL *propfound, return replaced; } -static LPWSTR build_default_format(const MSIRECORD* record) +static WCHAR *build_default_format( const MSIRECORD *record ) { - int i; - int count; - WCHAR *rc, buf[26]; static const WCHAR fmt[] = {'%','i',':',' ','[','%','i',']',' ',0}; - DWORD size; + int i, count = MSI_RecordGetFieldCount( record ); + WCHAR *ret, *tmp, buf[26]; + DWORD size = 1; - count = MSI_RecordGetFieldCount(record); - - rc = msi_alloc(1); - rc[0] = 0; - size = 1; + if (!(ret = msi_alloc( sizeof(*ret) ))) return NULL; + ret[0] = 0; for (i = 1; i <= count; i++) { - sprintfW(buf, fmt, i, i); - size += lstrlenW(buf); - rc = msi_realloc(rc, size * sizeof(WCHAR)); - lstrcatW(rc, buf); + size += sprintfW( buf, fmt, i, i ); + if (!(tmp = msi_realloc( ret, size * sizeof(*ret) ))) + { + msi_free( ret ); + return NULL; + } + ret = tmp; + strcatW( ret, buf ); } - - return rc; + return ret; } static BOOL format_is_number(WCHAR x)

1 0

Hans Leidekker : winhttp: Fix invalid reads with tracing on (Valgrind).
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: wine Branch: master Commit: 6283f4ed96339d9e30e263572cfee8b92add1180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6283f4ed96339d9e30e263572… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 4 16:49:42 2017 +0200 winhttp: Fix invalid reads with tracing on (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a355887..96a2c91 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -519,7 +519,7 @@ BOOL WINAPI WinHttpAddRequestHeaders( HINTERNET hrequest, LPCWSTR headers, DWORD BOOL ret; request_t *request; - TRACE("%p, %s, 0x%x, 0x%08x\n", hrequest, debugstr_w(headers), len, flags); + TRACE("%p, %s, %u, 0x%08x\n", hrequest, debugstr_wn(headers, len), len, flags); if (!headers || !len) { @@ -2172,8 +2172,8 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD heade BOOL ret; request_t *request; - TRACE("%p, %s, 0x%x, %u, %u, %lx\n", - hrequest, debugstr_w(headers), headers_len, optional_len, total_len, context); + TRACE("%p, %s, %u, %u, %u, %lx\n", hrequest, debugstr_wn(headers, headers_len), headers_len, optional_len, + total_len, context); if (!(request = (request_t *)grab_object( hrequest ))) {

1 0