April 2020 - Wine-Commits - list.winehq.org

Jacek Caban : server: Allow passing suspend context in select request.
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: e70b684dedaa1a7c9b5fc884f7083cbf7228600f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e70b684dedaa1a7c9b5fc884… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 15 14:55:03 2020 +0200 server: Allow passing suspend context in select request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 1 + include/wine/server_protocol.h | 8 +++++--- server/protocol.def | 5 ++++- server/request.h | 3 ++- server/thread.c | 22 ++++++++++++++++++++-- server/trace.c | 5 ++++- 6 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 9053ad2042..7e178aa745 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -624,6 +624,7 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT req->cookie = wine_server_client_ptr( &cookie ); req->prev_apc = apc_handle; req->timeout = abs_timeout; + req->size = size; wine_server_add_data( req, &result, sizeof(result) ); wine_server_add_data( req, select_op, size ); ret = server_call_unlocked( req ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 298e2dbfa4..77f62afb72 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1257,16 +1257,18 @@ struct select_request int flags; client_ptr_t cookie; abstime_t timeout; + data_size_t size; obj_handle_t prev_apc; /* VARARG(result,apc_result); */ - /* VARARG(data,select_op); */ - char __pad_36[4]; + /* VARARG(data,select_op,size); */ + /* VARARG(context,context); */ }; struct select_reply { struct reply_header __header; apc_call_t call; obj_handle_t apc_handle; + /* VARARG(context,context); */ char __pad_52[4]; }; #define SELECT_ALERTABLE 1 @@ -6716,7 +6718,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 598 +#define SERVER_PROTOCOL_VERSION 599 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index bfe817b654..318c3b0b83 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1106,12 +1106,15 @@ struct rawinput_device int flags; /* wait flags (see below) */ client_ptr_t cookie; /* magic cookie to return to client */ abstime_t timeout; /* timeout */ + data_size_t size; /* size of select_op */ obj_handle_t prev_apc; /* handle to previous APC */ VARARG(result,apc_result); /* result of previous APC */ - VARARG(data,select_op); /* operation-specific data */ + VARARG(data,select_op,size); /* operation-specific data */ + VARARG(context,context); /* suspend context */ @REPLY apc_call_t call; /* APC call arguments */ obj_handle_t apc_handle; /* handle to next APC */ + VARARG(context,context); /* suspend context */ @END #define SELECT_ALERTABLE 1 #define SELECT_INTERRUPTIBLE 2 diff --git a/server/request.h b/server/request.h index d8967211e7..c1f4fc6b39 100644 --- a/server/request.h +++ b/server/request.h @@ -938,7 +938,8 @@ C_ASSERT( sizeof(struct open_thread_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct select_request, flags) == 12 ); C_ASSERT( FIELD_OFFSET(struct select_request, cookie) == 16 ); C_ASSERT( FIELD_OFFSET(struct select_request, timeout) == 24 ); -C_ASSERT( FIELD_OFFSET(struct select_request, prev_apc) == 32 ); +C_ASSERT( FIELD_OFFSET(struct select_request, size) == 32 ); +C_ASSERT( FIELD_OFFSET(struct select_request, prev_apc) == 36 ); C_ASSERT( sizeof(struct select_request) == 40 ); C_ASSERT( FIELD_OFFSET(struct select_reply, call) == 8 ); C_ASSERT( FIELD_OFFSET(struct select_reply, apc_handle) == 48 ); diff --git a/server/thread.c b/server/thread.c index ba481223b7..d75dc238d5 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1536,18 +1536,36 @@ DECL_HANDLER(select) struct thread_apc *apc; const apc_result_t *result = get_req_data(); - if (get_req_data_size() < sizeof(*result)) + if (get_req_data_size() < sizeof(*result) || + get_req_data_size() - sizeof(*result) < req->size || + req->size & 3) { set_error( STATUS_INVALID_PARAMETER ); return; } + + if (get_req_data_size() - sizeof(*result) - req->size == sizeof(context_t)) + { + const context_t *context = (const context_t *)((const char *)(result + 1) + req->size); + if (current->context || context->cpu != current->process->cpu) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + + if (!(current->suspend_context = mem_alloc( sizeof(*context) ))) return; + memcpy( current->suspend_context, context, sizeof(*context) ); + current->suspend_context->flags = 0; /* to keep track of what is modified */ + current->context = current->suspend_context; + } + if (!req->cookie) { set_error( STATUS_INVALID_PARAMETER ); return; } - op_size = min( get_req_data_size() - sizeof(*result), sizeof(select_op) ); + op_size = min( req->size, sizeof(select_op) ); memset( &select_op, 0, sizeof(select_op) ); memcpy( &select_op, result + 1, op_size ); diff --git a/server/trace.c b/server/trace.c index 095a45f0dd..9dd7ab73a1 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1588,15 +1588,18 @@ static void dump_select_request( const struct select_request *req ) fprintf( stderr, " flags=%d", req->flags ); dump_uint64( ", cookie=", &req->cookie ); dump_abstime( ", timeout=", &req->timeout ); + fprintf( stderr, ", size=%u", req->size ); fprintf( stderr, ", prev_apc=%04x", req->prev_apc ); dump_varargs_apc_result( ", result=", cur_size ); - dump_varargs_select_op( ", data=", cur_size ); + dump_varargs_select_op( ", data=", min(cur_size,req->size) ); + dump_varargs_context( ", context=", cur_size ); } static void dump_select_reply( const struct select_reply *req ) { dump_apc_call( " call=", &req->call ); fprintf( stderr, ", apc_handle=%04x", req->apc_handle ); + dump_varargs_context( ", context=", cur_size ); } static void dump_create_event_request( const struct create_event_request *req )

1 0

Jeff Smith : gdiplus: Reuse point when calling GdipAddPathLine on open figure.
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: f54bf06a2a593825e228db0e2a316df66d233af8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f54bf06a2a593825e228db0e… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Apr 15 15:07:09 2020 -0500 gdiplus: Reuse point when calling GdipAddPathLine on open figure. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 24 ++++++------------------ dlls/gdiplus/tests/graphicspath.c | 5 ++++- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 2729455567..083b79b932 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -717,31 +717,19 @@ GpStatus WINGDIPAPI GdipAddPathLine2I(GpPath *path, GDIPCONST GpPoint *points, I */ GpStatus WINGDIPAPI GdipAddPathLine(GpPath *path, REAL x1, REAL y1, REAL x2, REAL y2) { - INT old_count; + PointF points[2]; TRACE("(%p, %.2f, %.2f, %.2f, %.2f)\n", path, x1, y1, x2, y2); if(!path) return InvalidParameter; - if(!lengthen_path(path, 2)) - return OutOfMemory; - - old_count = path->pathdata.Count; - - path->pathdata.Points[old_count].X = x1; - path->pathdata.Points[old_count].Y = y1; - path->pathdata.Points[old_count + 1].X = x2; - path->pathdata.Points[old_count + 1].Y = y2; - - path->pathdata.Types[old_count] = - (path->newfigure ? PathPointTypeStart : PathPointTypeLine); - path->pathdata.Types[old_count + 1] = PathPointTypeLine; - - path->newfigure = FALSE; - path->pathdata.Count += 2; + points[0].X = x1; + points[0].Y = y1; + points[1].X = x2; + points[1].Y = y2; - return Ok; + return extend_current_figure(path, points, 2, PathPointTypeLine); } /************************************************************************* diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index d19c7836fb..1af53762e4 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -722,7 +722,8 @@ static path_test_t linei_path[] = { {15.00, 15.00, PathPointTypeLine, 0, 0}, /*9*/ {26.00, 28.00, PathPointTypeLine | PathPointTypeCloseSubpath, 0, 0}, /*10*/ {35.00, 35.00, PathPointTypeStart, 0, 0}, /*11*/ - {36.00, 38.00, PathPointTypeLine, 0, 0} /*12*/ + {36.00, 38.00, PathPointTypeLine, 0, 0}, /*12*/ + {39.00, 40.00, PathPointTypeLine, 0, 0} /*13*/ }; static void test_linei(void) @@ -739,6 +740,8 @@ static void test_linei(void) GdipClosePathFigure(path); status = GdipAddPathLineI(path, 35.0, 35.0, 36.0, 38.0); expect(Ok, status); + status = GdipAddPathLineI(path, 36, 38, 39, 40); + expect(Ok, status); ok_path(path, linei_path, ARRAY_SIZE(linei_path), FALSE);

1 0

Zebediah Figura : winegstreamer: Delay-load mfplat.
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: 5d0e10b77c0ef262b059318f149841b6c999703e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d0e10b77c0ef262b059318f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 16 00:33:59 2020 -0500 winegstreamer: Delay-load mfplat. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 097edf273f..337c1086e6 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,5 +1,6 @@ MODULE = winegstreamer.dll -IMPORTS = strmiids uuid ole32 mfplat mfuuid +IMPORTS = strmiids uuid ole32 mfuuid +DELAYIMPORTS = mfplat EXTRAINCL = $(GSTREAMER_CFLAGS) EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) PARENTSRC = ../strmbase

1 0

Alexandre Julliard : winebuild: Add --fixup-ctors option to allow intercepting constructors in .so files.
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: 6c4046fef1fb4a78cfb649de34af7770ffe05024 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c4046fef1fb4a78cfb649de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 12:21:23 2020 +0200 winebuild: Add --fixup-ctors option to allow intercepting constructors in .so files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 13 +++- tools/winebuild/spec32.c | 159 +++++++++++++++++++++++++++++++++++++++ tools/winebuild/winebuild.man.in | 14 +++- 4 files changed, 182 insertions(+), 5 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 65493ec37f..b30785b74a 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -321,6 +321,7 @@ extern void output_fake_module16( DLLSPEC *spec16 ); extern void output_res_o_file( DLLSPEC *spec ); extern void output_asm_relays16(void); extern void make_builtin_files( char *argv[] ); +extern void fixup_constructors( char *argv[] ); extern void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 ); extern int parse_spec_file( FILE *file, DLLSPEC *spec ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index db8587c3bd..d973a4e973 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -115,6 +115,7 @@ enum exec_mode_values MODE_IMPLIB, MODE_STATICLIB, MODE_BUILTIN, + MODE_FIXUP_CTORS, MODE_RESOURCES }; @@ -301,8 +302,9 @@ static const char usage_str[] = " --exe Build an executable from object files\n" " --implib Build an import library\n" " --staticlib Build a static library\n" -" --builtin Mark a library as a Wine builtin\n" " --resources Build a .o or .res file for the resource files\n\n" +" --builtin Mark a library as a Wine builtin\n" +" --fixup-ctors Fixup the constructors data after the module has been built\n" "The mode options are mutually exclusive; you must specify one and only one.\n\n"; enum long_options_values @@ -316,6 +318,7 @@ enum long_options_values LONG_OPT_CCCMD, LONG_OPT_EXTERNAL_SYMS, LONG_OPT_FAKE_MODULE, + LONG_OPT_FIXUP_CTORS, LONG_OPT_LARGE_ADDRESS_AWARE, LONG_OPT_LDCMD, LONG_OPT_NMCMD, @@ -341,6 +344,7 @@ static const struct option long_options[] = { "cc-cmd", 1, 0, LONG_OPT_CCCMD }, { "external-symbols", 0, 0, LONG_OPT_EXTERNAL_SYMS }, { "fake-module", 0, 0, LONG_OPT_FAKE_MODULE }, + { "fixup-ctors", 0, 0, LONG_OPT_FIXUP_CTORS }, { "large-address-aware", 0, 0, LONG_OPT_LARGE_ADDRESS_AWARE }, { "ld-cmd", 1, 0, LONG_OPT_LDCMD }, { "nm-cmd", 1, 0, LONG_OPT_NMCMD }, @@ -511,6 +515,9 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) case LONG_OPT_BUILTIN: set_exec_mode( MODE_BUILTIN ); break; + case LONG_OPT_FIXUP_CTORS: + set_exec_mode( MODE_FIXUP_CTORS ); + break; case LONG_OPT_ASCMD: as_command = strarray_fromstring( optarg, " " ); break; @@ -701,6 +708,10 @@ int main(int argc, char **argv) if (!argv[0]) fatal_error( "missing file argument for --builtin option\n" ); make_builtin_files( argv ); break; + case MODE_FIXUP_CTORS: + if (!argv[0]) fatal_error( "missing file argument for --fixup-ctors option\n" ); + fixup_constructors( argv ); + break; case MODE_RESOURCES: load_resources( argv, spec ); output_res_o_file( spec ); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 631a467a5e..6e6f502e99 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -1095,3 +1095,162 @@ void make_builtin_files( char *argv[] ) close( fd ); } } + +static void fixup_elf32( const char *name, int fd, void *header, size_t header_size ) +{ + struct + { + unsigned char e_ident[16]; + unsigned short e_type; + unsigned short e_machine; + unsigned int e_version; + unsigned int e_entry; + unsigned int e_phoff; + unsigned int e_shoff; + unsigned int e_flags; + unsigned short e_ehsize; + unsigned short e_phentsize; + unsigned short e_phnum; + unsigned short e_shentsize; + unsigned short e_shnum; + unsigned short e_shstrndx; + } *elf = header; + struct + { + unsigned int p_type; + unsigned int p_offset; + unsigned int p_vaddr; + unsigned int p_paddr; + unsigned int p_filesz; + unsigned int p_memsz; + unsigned int p_flags; + unsigned int p_align; + } *phdr; + struct + { + unsigned int d_tag; + unsigned int d_val; + } *dyn; + + unsigned int i, size; + + if (header_size < sizeof(*elf)) return; + if (elf->e_ident[6] != 1 /* EV_CURRENT */) return; + + size = elf->e_phnum * elf->e_phentsize; + phdr = xmalloc( size ); + lseek( fd, elf->e_phoff, SEEK_SET ); + if (read( fd, phdr, size ) != size) return; + + for (i = 0; i < elf->e_phnum; i++) + { + if (phdr->p_type == 2 /* PT_DYNAMIC */ ) break; + phdr = (void *)((char *)phdr + elf->e_phentsize); + } + if (i == elf->e_phnum) return; + + dyn = xmalloc( phdr->p_filesz ); + lseek( fd, phdr->p_offset, SEEK_SET ); + if (read( fd, dyn, phdr->p_filesz ) != phdr->p_filesz) return; + for (i = 0; i < phdr->p_filesz / sizeof(*dyn) && dyn[i].d_tag; i++) + { + switch (dyn[i].d_tag) + { + case 25: dyn[i].d_tag = 0x60009990; break; /* DT_INIT_ARRAY */ + case 27: dyn[i].d_tag = 0x60009991; break; /* DT_INIT_ARRAYSZ */ + case 12: dyn[i].d_tag = 0x60009992; break; /* DT_INIT */ + } + } + lseek( fd, phdr->p_offset, SEEK_SET ); + write( fd, dyn, phdr->p_filesz ); +} + +static void fixup_elf64( const char *name, int fd, void *header, size_t header_size ) +{ + struct + { + unsigned char e_ident[16]; + unsigned short e_type; + unsigned short e_machine; + unsigned int e_version; + unsigned __int64 e_entry; + unsigned __int64 e_phoff; + unsigned __int64 e_shoff; + unsigned int e_flags; + unsigned short e_ehsize; + unsigned short e_phentsize; + unsigned short e_phnum; + unsigned short e_shentsize; + unsigned short e_shnum; + unsigned short e_shstrndx; + } *elf = header; + struct + { + unsigned int p_type; + unsigned int p_flags; + unsigned __int64 p_offset; + unsigned __int64 p_vaddr; + unsigned __int64 p_paddr; + unsigned __int64 p_filesz; + unsigned __int64 p_memsz; + unsigned __int64 p_align; + } *phdr; + struct + { + unsigned __int64 d_tag; + unsigned __int64 d_val; + } *dyn; + + unsigned int i, size; + + if (header_size < sizeof(*elf)) return; + if (elf->e_ident[6] != 1 /* EV_CURRENT */) return; + + size = elf->e_phnum * elf->e_phentsize; + phdr = xmalloc( size ); + lseek( fd, elf->e_phoff, SEEK_SET ); + if (read( fd, phdr, size ) != size) return; + + for (i = 0; i < elf->e_phnum; i++) + { + if (phdr->p_type == 2 /* PT_DYNAMIC */ ) break; + phdr = (void *)((char *)phdr + elf->e_phentsize); + } + if (i == elf->e_phnum) return; + + dyn = xmalloc( phdr->p_filesz ); + lseek( fd, phdr->p_offset, SEEK_SET ); + if (read( fd, dyn, phdr->p_filesz ) != phdr->p_filesz) return; + for (i = 0; i < phdr->p_filesz / sizeof(*dyn) && dyn[i].d_tag; i++) + { + switch (dyn[i].d_tag) + { + case 25: dyn[i].d_tag = 0x60009990; break; /* DT_INIT_ARRAY */ + case 27: dyn[i].d_tag = 0x60009991; break; /* DT_INIT_ARRAYSZ */ + case 12: dyn[i].d_tag = 0x60009992; break; /* DT_INIT */ + } + } + lseek( fd, phdr->p_offset, SEEK_SET ); + write( fd, dyn, phdr->p_filesz ); +} + +/******************************************************************* + * fixup_constructors + */ +void fixup_constructors( char *argv[] ) +{ + int i, fd, size; + unsigned int header[64]; + + for (i = 0; argv[i]; i++) + { + if ((fd = open( argv[i], O_RDWR | O_BINARY )) == -1) fatal_perror( "Cannot open %s", argv[i] ); + size = read( fd, &header, sizeof(header) ); + if (size > 5) + { + if (!memcmp( header, "\177ELF\001", 5 )) fixup_elf32( argv[i], fd, header, size ); + else if (!memcmp( header, "\177ELF\002", 5 )) fixup_elf64( argv[i], fd, header, size ); + } + close( fd ); + } +} diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 29a17484ad..9c91c1a504 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -54,16 +54,22 @@ in .delay.a, a delayed import library is built. .BI \--staticlib Build a .a static library from object files. .TP -.BI \--builtin -Mark a PE module as a Wine builtin module, by adding the "Wine builtin -DLL" signature string after the DOS header. -.TP .B \--resources Generate a .o file containing all the input resources. This is useful when building with a PE compiler, since the PE binutils cannot handle multiple resource files as input. For a standard Unix build, the resource files are automatically included when building the spec file, so there's no need for an intermediate .o file. +.TP +.BI \--builtin +Mark a PE module as a Wine builtin module, by adding the "Wine builtin +DLL" signature string after the DOS header. +.TP +.BI \--fixup-ctors +Fixup constructors after a module has been built. This should be done +on the final .so module if its code contains constructors, to ensure +that Wine has a chance to initialize the module before the +constructors are executed. .SH OPTIONS .TP .BI \--as-cmd= as-command

1 0

Alexandre Julliard : advapi32: Use WINEUSERNAME variable to implement GetUserNameA/W.
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: f8fb43aaba499c6d0da05b0ee3a09c349a753cf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8fb43aaba499c6d0da05b0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 15:15:21 2020 +0200 advapi32: Use WINEUSERNAME variable to implement GetUserNameA/W. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi.c | 79 +++++++++----------------------------------------- 1 file changed, 14 insertions(+), 65 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 433c25820d..cfd79e02af 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -32,7 +32,6 @@ #include "wincred.h" #include "wct.h" -#include "wine/library.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -42,81 +41,31 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); /****************************************************************************** * GetUserNameA [ADVAPI32.@] - * - * Get the current user name. - * - * PARAMS - * lpszName [O] Destination for the user name. - * lpSize [I/O] Size of lpszName. - * - * RETURNS - * Success: The length of the user name, including terminating NUL. - * Failure: ERROR_MORE_DATA if *lpSize is too small. */ -BOOL WINAPI -GetUserNameA( LPSTR lpszName, LPDWORD lpSize ) +BOOL WINAPI GetUserNameA( LPSTR name, LPDWORD size ) { - WCHAR *buffer; + DWORD len = GetEnvironmentVariableA( "WINEUSERNAME", name, *size ); BOOL ret; - DWORD sizeW = *lpSize; - - if (!(buffer = heap_alloc( sizeW * sizeof(WCHAR) ))) - { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return FALSE; - } - ret = GetUserNameW( buffer, &sizeW ); - if (ret) - *lpSize = WideCharToMultiByte( CP_ACP, 0, buffer, -1, lpszName, *lpSize, NULL, NULL ); - else - *lpSize = sizeW; - - heap_free( buffer ); + if (!len) return FALSE; + if ((ret = (len < *size))) len++; + *size = len; return ret; } /****************************************************************************** * GetUserNameW [ADVAPI32.@] - * - * See GetUserNameA. */ -BOOL WINAPI -GetUserNameW( LPWSTR lpszName, LPDWORD lpSize ) +BOOL WINAPI GetUserNameW( LPWSTR name, LPDWORD size ) { - const char *name = wine_get_user_name(); - DWORD i, len = MultiByteToWideChar( CP_UNIXCP, 0, name, -1, NULL, 0 ); - LPWSTR backslash; - - if (len > *lpSize) - { - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - *lpSize = len; - return FALSE; - } - - *lpSize = len; - MultiByteToWideChar( CP_UNIXCP, 0, name, -1, lpszName, len ); - - /* Word uses the user name to create named mutexes and file mappings, - * and backslashes in the name cause the creation to fail. - * Also, Windows doesn't return the domain name in the user name even when - * joined to a domain. A Unix box joined to a domain using winbindd will - * contain the domain name in the username. So we need to cut this off. - * FIXME: Only replaces forward and backslashes for now, should get the - * winbind separator char from winbindd and replace that. - */ - for (i = 0; lpszName[i]; i++) - if (lpszName[i] == '/') lpszName[i] = '\\'; - - backslash = strrchrW(lpszName, '\\'); - if (backslash == NULL) - return TRUE; - - len = lstrlenW(backslash); - memmove(lpszName, backslash + 1, len * sizeof(WCHAR)); - *lpSize = len; - return TRUE; + static const WCHAR wineusernameW[] = {'W','I','N','E','U','S','E','R','N','A','M','E',0}; + DWORD len = GetEnvironmentVariableW( wineusernameW, name, *size ); + BOOL ret; + + if (!len) return FALSE; + if ((ret = (len < *size))) len++; + *size = len; + return ret; } /******************************************************************************

1 0

Alexandre Julliard : kernel32: Move GetNamedPipeHandleStateW() implementation to kernelbase.
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: 99027aeaee22b72e5cbd62f83d26f2b2d973dd57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99027aeaee22b72e5cbd62f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 15:34:59 2020 +0200 kernel32: Move GetNamedPipeHandleStateW() implementation to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +-- dlls/kernel32/sync.c | 60 ----------------------------------------- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/sync.c | 38 ++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 63 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a5550dd359..01bfdd37f1 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -731,8 +731,8 @@ # @ stub GetNamedPipeClientComputerNameW @ stdcall GetNamedPipeClientProcessId(long ptr) @ stdcall GetNamedPipeClientSessionId(long ptr) -@ stdcall GetNamedPipeHandleStateA(long ptr ptr ptr ptr str long) -@ stdcall GetNamedPipeHandleStateW(long ptr ptr ptr ptr wstr long) +@ stdcall GetNamedPipeHandleStateA(long ptr ptr ptr ptr ptr long) +@ stdcall -import GetNamedPipeHandleStateW(long ptr ptr ptr ptr ptr long) @ stdcall -import GetNamedPipeInfo(long ptr ptr ptr ptr) @ stdcall GetNamedPipeServerProcessId(long ptr) @ stdcall GetNamedPipeServerSessionId(long ptr) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 48f9fca20a..7a7a37b4a2 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -42,7 +42,6 @@ #include "ddk/wdm.h" #include "wine/asm.h" -#include "wine/library.h" #include "wine/unicode.h" #include "kernel_private.h" @@ -630,65 +629,6 @@ BOOL WINAPI GetNamedPipeHandleStateA( return ret; } -/*********************************************************************** - * GetNamedPipeHandleStateW (KERNEL32.@) - */ -BOOL WINAPI GetNamedPipeHandleStateW( - HANDLE hNamedPipe, LPDWORD lpState, LPDWORD lpCurInstances, - LPDWORD lpMaxCollectionCount, LPDWORD lpCollectDataTimeout, - LPWSTR lpUsername, DWORD nUsernameMaxSize) -{ - IO_STATUS_BLOCK iosb; - NTSTATUS status; - - FIXME("%p %p %p %p %p %p %d: semi-stub\n", hNamedPipe, lpState, lpCurInstances, - lpMaxCollectionCount, lpCollectDataTimeout, lpUsername, nUsernameMaxSize); - - if (lpMaxCollectionCount) - *lpMaxCollectionCount = 0; - - if (lpCollectDataTimeout) - *lpCollectDataTimeout = 0; - - if (lpUsername && nUsernameMaxSize) - { - const char *username = wine_get_user_name(); - int len = MultiByteToWideChar(CP_UNIXCP, 0, username, -1, lpUsername, nUsernameMaxSize); - if (!len) *lpUsername = 0; - } - - if (lpState) - { - FILE_PIPE_INFORMATION fpi; - status = NtQueryInformationFile(hNamedPipe, &iosb, &fpi, sizeof(fpi), - FilePipeInformation); - if (status) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - - *lpState = (fpi.ReadMode ? PIPE_READMODE_MESSAGE : PIPE_READMODE_BYTE) | - (fpi.CompletionMode ? PIPE_NOWAIT : PIPE_WAIT); - } - - if (lpCurInstances) - { - FILE_PIPE_LOCAL_INFORMATION fpli; - status = NtQueryInformationFile(hNamedPipe, &iosb, &fpli, sizeof(fpli), - FilePipeLocalInformation); - if (status) - { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; - } - - *lpCurInstances = fpli.CurrentInstances; - } - - return TRUE; -} - /*********************************************************************** * CallNamedPipeA (KERNEL32.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 9aa0613ea5..631e5c02c7 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -570,7 +570,7 @@ @ stub GetNamedLocaleHashNode @ stub GetNamedPipeAttribute @ stub GetNamedPipeClientComputerNameW -@ stdcall GetNamedPipeHandleStateW(long ptr ptr ptr ptr wstr long) kernel32.GetNamedPipeHandleStateW +@ stdcall GetNamedPipeHandleStateW(long ptr ptr ptr ptr ptr long) @ stdcall GetNamedPipeInfo(long ptr ptr ptr ptr) @ stdcall GetNativeSystemInfo(ptr) # @ stub GetNextFgPolicyRefreshInfoInternal diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index 441b47ffb0..c0db4679e9 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -1201,6 +1201,44 @@ BOOL WINAPI DECLSPEC_HOTPATCH DisconnectNamedPipe( HANDLE pipe ) } +/*********************************************************************** + * GetNamedPipeHandleStateW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH GetNamedPipeHandleStateW( HANDLE pipe, DWORD *state, DWORD *instances, + DWORD *max_count, DWORD *timeout, + WCHAR *user, DWORD size ) +{ + IO_STATUS_BLOCK io; + + FIXME( "%p %p %p %p %p %p %d: semi-stub\n", pipe, state, instances, max_count, timeout, user, size ); + + if (max_count) *max_count = 0; + if (timeout) *timeout = 0; + if (user && size && !GetEnvironmentVariableW( L"WINEUSERNAME", user, size )) user[0] = 0; + + if (state) + { + FILE_PIPE_INFORMATION info; + + if (!set_ntstatus( NtQueryInformationFile( pipe, &io, &info, sizeof(info), FilePipeInformation ))) + return FALSE; + + *state = (info.ReadMode ? PIPE_READMODE_MESSAGE : PIPE_READMODE_BYTE) | + (info.CompletionMode ? PIPE_NOWAIT : PIPE_WAIT); + } + if (instances) + { + FILE_PIPE_LOCAL_INFORMATION info; + + if (!set_ntstatus( NtQueryInformationFile( pipe, &io, &info, sizeof(info), + FilePipeLocalInformation))) + return FALSE; + *instances = info.CurrentInstances; + } + return TRUE; +} + + /*********************************************************************** * GetNamedPipeInfo (kernelbase.@) */

1 0

Jeff Smith : gdiplus: Reuse point when calling GdipAddPathBezier on open figure.
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: 1a3a8a00165b0debdcb458b3680de61163a71a84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a3a8a00165b0debdcb458b3… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Apr 15 15:07:07 2020 -0500 gdiplus: Reuse point when calling GdipAddPathBezier on open figure. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 80 +++++++++++++++++++++++++++------------ dlls/gdiplus/tests/graphicspath.c | 34 +++++++++++++++++ 2 files changed, 90 insertions(+), 24 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 4d5a73588f..547f172d98 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -166,6 +166,52 @@ static BOOL flatten_bezier(path_list_node_t *start, REAL x2, REAL y2, REAL x3, R return TRUE; } +/* GdipAddPath* helper + * + * Several GdipAddPath functions are expected to add onto an open figure. + * So if the first point being added is an exact match to the last point + * of the existing line, that point should not be added. + * + * Parameters: + * path : path to which points should be added + * points : array of points to add + * count : number of points to add (at least 1) + * type : type of the points being added + * + * Return value: + * OutOfMemory : out of memory, could not lengthen path + * Ok : success + */ +static GpStatus extend_current_figure(GpPath *path, GDIPCONST PointF *points, INT count, BYTE type) +{ + INT insert_index = path->pathdata.Count; + BYTE first_point_type = (path->newfigure ? PathPointTypeStart : PathPointTypeLine); + + if(!path->newfigure && + path->pathdata.Points[insert_index-1].X == points[0].X && + path->pathdata.Points[insert_index-1].Y == points[0].Y) + { + points++; + count--; + first_point_type = type; + } + + if(!count) + return Ok; + + if(!lengthen_path(path, count)) + return OutOfMemory; + + memcpy(path->pathdata.Points + insert_index, points, sizeof(GpPointF)*count); + path->pathdata.Types[insert_index] = first_point_type; + memset(path->pathdata.Types + insert_index + 1, type, count - 1); + + path->newfigure = FALSE; + path->pathdata.Count += count; + + return Ok; +} + /******************************************************************************* * GdipAddPathArc [GDIPLUS.1] * @@ -243,7 +289,7 @@ GpStatus WINGDIPAPI GdipAddPathArcI(GpPath *path, INT x1, INT y1, INT x2, GpStatus WINGDIPAPI GdipAddPathBezier(GpPath *path, REAL x1, REAL y1, REAL x2, REAL y2, REAL x3, REAL y3, REAL x4, REAL y4) { - INT old_count; + PointF points[4]; TRACE("(%p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", path, x1, y1, x2, y2, x3, y3, x4, y4); @@ -251,30 +297,16 @@ GpStatus WINGDIPAPI GdipAddPathBezier(GpPath *path, REAL x1, REAL y1, REAL x2, if(!path) return InvalidParameter; - if(!lengthen_path(path, 4)) - return OutOfMemory; - - old_count = path->pathdata.Count; + points[0].X = x1; + points[0].Y = y1; + points[1].X = x2; + points[1].Y = y2; + points[2].X = x3; + points[2].Y = y3; + points[3].X = x4; + points[3].Y = y4; - path->pathdata.Points[old_count].X = x1; - path->pathdata.Points[old_count].Y = y1; - path->pathdata.Points[old_count + 1].X = x2; - path->pathdata.Points[old_count + 1].Y = y2; - path->pathdata.Points[old_count + 2].X = x3; - path->pathdata.Points[old_count + 2].Y = y3; - path->pathdata.Points[old_count + 3].X = x4; - path->pathdata.Points[old_count + 3].Y = y4; - - path->pathdata.Types[old_count] = - (path->newfigure ? PathPointTypeStart : PathPointTypeLine); - path->pathdata.Types[old_count + 1] = PathPointTypeBezier; - path->pathdata.Types[old_count + 2] = PathPointTypeBezier; - path->pathdata.Types[old_count + 3] = PathPointTypeBezier; - - path->newfigure = FALSE; - path->pathdata.Count += 4; - - return Ok; + return extend_current_figure(path, points, 4, PathPointTypeBezier); } GpStatus WINGDIPAPI GdipAddPathBezierI(GpPath *path, INT x1, INT y1, INT x2, diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 7670a6c41f..d85cf68dfc 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -332,6 +332,39 @@ static void test_line2(void) GdipDeletePath(path); } +static path_test_t bezier_path[] = { + {10.0, 10.0, PathPointTypeStart, 0, 0}, /*0*/ + {20.0, 10.0, PathPointTypeBezier, 0, 0}, /*1*/ + {20.0, 20.0, PathPointTypeBezier, 0, 0}, /*2*/ + {30.0, 20.0, PathPointTypeBezier, 0, 0}, /*3*/ + {40.0, 20.0, PathPointTypeBezier, 0, 0}, /*4*/ + {40.0, 30.0, PathPointTypeBezier, 0, 0}, /*5*/ + {50.0, 30.0, PathPointTypeBezier, 0, 0}, /*6*/ + {50.0, 10.0, PathPointTypeLine, 0, 0}, /*7*/ + {60.0, 10.0, PathPointTypeBezier, 0, 0}, /*8*/ + {60.0, 20.0, PathPointTypeBezier, 0, 0}, /*9*/ + {70.0, 20.0, PathPointTypeBezier, 0, 0} /*10*/ + }; + +static void test_bezier(void) +{ + GpStatus status; + GpPath* path; + + GdipCreatePath(FillModeAlternate, &path); + + status = GdipAddPathBezier(path, 10.0, 10.0, 20.0, 10.0, 20.0, 20.0, 30.0, 20.0); + expect(Ok, status); + status = GdipAddPathBezier(path, 30.0, 20.0, 40.0, 20.0, 40.0, 30.0, 50.0, 30.0); + expect(Ok, status); + status = GdipAddPathBezier(path, 50.0, 10.0, 60.0, 10.0, 60.0, 20.0, 70.0, 20.0); + expect(Ok, status); + + ok_path(path, bezier_path, ARRAY_SIZE(bezier_path), FALSE); + + GdipDeletePath(path); +} + static path_test_t arc_path[] = { {600.0, 450.0, PathPointTypeStart, 0, 0}, /*0*/ {600.0, 643.3, PathPointTypeBezier, 0, 0}, /*1*/ @@ -1784,6 +1817,7 @@ START_TEST(graphicspath) test_getpathdata(); test_createpath2(); test_line2(); + test_bezier(); test_arc(); test_worldbounds(); test_pathpath();

1 0

Michael Stefaniuc : oledb32: Remove redundant NULL check before CoTaskMemFree().
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: c0041d70c46be6f7a69a61c0143c9c603cd6760f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0041d70c46be6f7a69a61c0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Apr 16 00:08:28 2020 +0200 oledb32: Remove redundant NULL check before CoTaskMemFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/dslocator.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 8a7f2d134c..86a334bea0 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -72,8 +72,7 @@ static void destroy_datasource(struct datasource *data) CoTaskMemFree(data->propinfoset->rgPropertyInfos); CoTaskMemFree(data->propinfoset); } - if (data->description) - CoTaskMemFree(data->description); + CoTaskMemFree(data->description); if (data->provider) IDBProperties_Release(data->provider);

1 0

Alexandre Julliard : ntdll: Use a Wine-specific field in WINE_MODREF for the .so handle.
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: 3935acd4dafce40a08417cf1edceb7607592eb16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3935acd4dafce40a08417cf1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 12:00:43 2020 +0200 ntdll: Use a Wine-specific field in WINE_MODREF for the .so handle. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c67e1a3d2b..c32292d453 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -121,6 +121,7 @@ typedef struct _wine_modref LDR_MODULE ldr; dev_t dev; ino_t ino; + void *so_handle; int alloc_deps; int nDeps; struct _wine_modref **deps; @@ -585,7 +586,7 @@ static WINE_MODREF *find_so_module( void *handle ) LDR_MODULE *mod = CONTAINING_RECORD( entry, LDR_MODULE, InLoadOrderModuleList ); WINE_MODREF *wm = CONTAINING_RECORD( mod, WINE_MODREF, ldr ); - if (mod->Flags & LDR_WINE_INTERNAL && mod->SectionHandle == handle) return wm; + if (wm->so_handle == handle) return wm; } return NULL; } @@ -2806,7 +2807,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, TRACE_(loaddll)( "Loaded %s at %p: builtin\n", debugstr_w(info.wm->ldr.FullDllName.Buffer), info.wm->ldr.BaseAddress ); info.wm->ldr.LoadCount = 1; - info.wm->ldr.SectionHandle = handle; + info.wm->so_handle = handle; } } else if (!info.wm) @@ -2829,7 +2830,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, { TRACE_(loaddll)( "Loaded %s at %p: builtin\n", debugstr_w(info.wm->ldr.FullDllName.Buffer), info.wm->ldr.BaseAddress ); info.wm->ldr.LoadCount = 1; - info.wm->ldr.SectionHandle = handle; + info.wm->so_handle = handle; } *pwm = info.wm; @@ -3760,7 +3761,7 @@ static void free_modref( WINE_MODREF *wm ) free_tls_slot( &wm->ldr ); RtlReleaseActivationContext( wm->ldr.ActivationContext ); - if ((wm->ldr.Flags & LDR_WINE_INTERNAL) && wm->ldr.SectionHandle) dlclose( wm->ldr.SectionHandle ); + if (wm->so_handle) dlclose( wm->so_handle ); NtUnmapViewOfSection( NtCurrentProcess(), wm->ldr.BaseAddress ); if (cached_modref == wm) cached_modref = NULL; RtlFreeUnicodeString( &wm->ldr.FullDllName );

1 0

Alexandre Julliard : configure: Add check for dlinfo().
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: 3154cda6bda9f8b43ea17304caecc5ecf46d8793 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3154cda6bda9f8b43ea17304… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 12:22:10 2020 +0200 configure: Add check for dlinfo(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 9 +++++---- configure.ac | 2 +- include/config.h.in | 3 +++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/configure b/configure index b41f1c797f..87cd2906e6 100755 --- a/configure +++ b/configure @@ -17864,12 +17864,13 @@ fi ac_wine_check_funcs_save_LIBS="$LIBS" LIBS="$LIBS $DL_LIBS" -for ac_func in dladdr +for ac_func in dladdr dlinfo do : - ac_fn_c_check_func "$LINENO" "dladdr" "ac_cv_func_dladdr" -if test "x$ac_cv_func_dladdr" = xyes; then : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define HAVE_DLADDR 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi diff --git a/configure.ac b/configure.ac index 241ea82d83..d5c67e3879 100644 --- a/configure.ac +++ b/configure.ac @@ -2182,7 +2182,7 @@ CFLAGS="$ac_save_CFLAGS" dnl Check for -ldl AC_SEARCH_LIBS(dlopen, dl) -WINE_CHECK_LIB_FUNCS(dladdr,[$DL_LIBS]) +WINE_CHECK_LIB_FUNCS(dladdr dlinfo,[$DL_LIBS]) dnl Check for -lpoll for Mac OS X/Darwin if test "$ac_cv_func_poll" = no diff --git a/include/config.h.in b/include/config.h.in index 8cbf8db09a..24a037a50e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -110,6 +110,9 @@ /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H +/* Define to 1 if you have the `dlinfo' function. */ +#undef HAVE_DLINFO + /* Define to 1 if you have the <EGL/egl.h> header file. */ #undef HAVE_EGL_EGL_H

1 0