May 2015 - Wine-Commits - list.winehq.org

Martin Storsjo : api-ms-win-core-synch-l1-1-0: Add stub dll.
by Alexandre Julliard May 8, 2015

May 8, 2015

Module: wine Branch: master Commit: e5e620a82c25bf7c13b704f27a5c21b7617f998b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e620a82c25bf7c13b704f27… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 7 23:03:02 2015 +0300 api-ms-win-core-synch-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-synch-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-synch-l1-1-0.spec | 42 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 47 insertions(+) diff --git a/configure b/configure index 297a9d8..d2d3530 100755 --- a/configure +++ b/configure @@ -899,6 +899,7 @@ enable_api_ms_win_core_rtlsupport_l1_1_0 enable_api_ms_win_core_rtlsupport_l1_2_0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 enable_api_ms_win_core_string_l1_1_0 +enable_api_ms_win_core_synch_l1_1_0 enable_api_ms_win_core_synch_l1_2_0 enable_api_ms_win_core_sysinfo_l1_2_0 enable_api_ms_win_core_sysinfo_l1_2_1 @@ -17043,6 +17044,7 @@ wine_fn_config_dll api-ms-win-core-rtlsupport-l1-1-0 enable_api_ms_win_core_rtls wine_fn_config_dll api-ms-win-core-rtlsupport-l1-2-0 enable_api_ms_win_core_rtlsupport_l1_2_0 wine_fn_config_dll api-ms-win-core-shlwapi-legacy-l1-1-0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 +wine_fn_config_dll api-ms-win-core-synch-l1-1-0 enable_api_ms_win_core_synch_l1_1_0 wine_fn_config_dll api-ms-win-core-synch-l1-2-0 enable_api_ms_win_core_synch_l1_2_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-0 enable_api_ms_win_core_sysinfo_l1_2_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-1 enable_api_ms_win_core_sysinfo_l1_2_1 diff --git a/configure.ac b/configure.ac index d8baa5f..31c8147 100644 --- a/configure.ac +++ b/configure.ac @@ -2735,6 +2735,7 @@ WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-shlwapi-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-synch-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-1) diff --git a/dlls/api-ms-win-core-synch-l1-1-0/Makefile.in b/dlls/api-ms-win-core-synch-l1-1-0/Makefile.in new file mode 100644 index 0000000..09d35a0 --- /dev/null +++ b/dlls/api-ms-win-core-synch-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-synch-l1-1-0.dll diff --git a/dlls/api-ms-win-core-synch-l1-1-0/api-ms-win-core-synch-l1-1-0.spec b/dlls/api-ms-win-core-synch-l1-1-0/api-ms-win-core-synch-l1-1-0.spec new file mode 100644 index 0000000..2968e40 --- /dev/null +++ b/dlls/api-ms-win-core-synch-l1-1-0/api-ms-win-core-synch-l1-1-0.spec @@ -0,0 +1,42 @@ +@ stdcall AcquireSRWLockExclusive(ptr) kernel32.AcquireSRWLockExclusive +@ stdcall AcquireSRWLockShared(ptr) kernel32.AcquireSRWLockShared +@ stdcall CancelWaitableTimer(long) kernel32.CancelWaitableTimer +@ stdcall CreateEventA(ptr long long str) kernel32.CreateEventA +@ stdcall CreateEventExA(ptr str long long) kernel32.CreateEventExA +@ stdcall CreateEventExW(ptr wstr long long) kernel32.CreateEventExW +@ stdcall CreateEventW(ptr long long wstr) kernel32.CreateEventW +@ stdcall CreateMutexA(ptr long str) kernel32.CreateMutexA +@ stdcall CreateMutexExA(ptr str long long) kernel32.CreateMutexExA +@ stdcall CreateMutexExW(ptr wstr long long) kernel32.CreateMutexExW +@ stdcall CreateMutexW(ptr long wstr) kernel32.CreateMutexW +@ stdcall CreateSemaphoreExW(ptr long long wstr long long) kernel32.CreateSemaphoreExW +@ stdcall CreateWaitableTimerExW(ptr wstr long long) kernel32.CreateWaitableTimerExW +@ stdcall DeleteCriticalSection(ptr) kernel32.DeleteCriticalSection +@ stdcall EnterCriticalSection(ptr) kernel32.EnterCriticalSection +@ stdcall InitializeCriticalSection(ptr) kernel32.InitializeCriticalSection +@ stdcall InitializeCriticalSectionAndSpinCount(ptr long) kernel32.InitializeCriticalSectionAndSpinCount +@ stdcall InitializeCriticalSectionEx(ptr long long) kernel32.InitializeCriticalSectionEx +@ stdcall InitializeSRWLock(ptr) kernel32.InitializeSRWLock +@ stdcall LeaveCriticalSection(ptr) kernel32.LeaveCriticalSection +@ stdcall OpenEventA(long long str) kernel32.OpenEventA +@ stdcall OpenEventW(long long wstr) kernel32.OpenEventW +@ stdcall OpenMutexW(long long wstr) kernel32.OpenMutexW +@ stdcall OpenProcess(long long long) kernel32.OpenProcess +@ stdcall OpenSemaphoreW(long long wstr) kernel32.OpenSemaphoreW +@ stdcall OpenWaitableTimerW(long long wstr) kernel32.OpenWaitableTimerW +@ stdcall ReleaseMutex(long) kernel32.ReleaseMutex +@ stdcall ReleaseSRWLockExclusive(ptr) kernel32.ReleaseSRWLockExclusive +@ stdcall ReleaseSRWLockShared(ptr) kernel32.ReleaseSRWLockShared +@ stdcall ReleaseSemaphore(long long ptr) kernel32.ReleaseSemaphore +@ stdcall ResetEvent(long) kernel32.ResetEvent +@ stdcall SetCriticalSectionSpinCount(ptr long) kernel32.SetCriticalSectionSpinCount +@ stdcall SetEvent(long) kernel32.SetEvent +@ stdcall SetWaitableTimer(long ptr long ptr ptr long) kernel32.SetWaitableTimer +@ stdcall SetWaitableTimerEx(long ptr long ptr ptr ptr long) kernel32.SetWaitableTimerEx +@ stdcall SleepEx(long long) kernel32.SleepEx +@ stdcall TryAcquireSRWLockExclusive(ptr) kernel32.TryAcquireSRWLockExclusive +@ stdcall TryAcquireSRWLockShared(ptr) kernel32.TryAcquireSRWLockShared +@ stdcall TryEnterCriticalSection(ptr) kernel32.TryEnterCriticalSection +@ stdcall WaitForMultipleObjectsEx(long ptr long long long) kernel32.WaitForMultipleObjectsEx +@ stdcall WaitForSingleObject(long long) kernel32.WaitForSingleObject +@ stdcall WaitForSingleObjectEx(long long long) kernel32.WaitForSingleObjectEx diff --git a/tools/make_specfiles b/tools/make_specfiles index e8c3b5d..ef78d11 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -150,6 +150,7 @@ my @dll_groups = "api-ms-win-core-string-l1-1-0", "api-ms-win-core-sysinfo-l1-2-0", "api-ms-win-core-util-l1-1-0", + "api-ms-win-core-synch-l1-1-0", "api-ms-win-core-synch-l1-2-0", "api-ms-win-core-console-l1-1-0", "api-ms-win-core-file-l1-1-0",

1 0

Alexandre Julliard : server: Make async objects waitable.
by Alexandre Julliard May 8, 2015

May 8, 2015

Module: wine Branch: master Commit: ad53ffc9c0f01eb84d182c32fb9315779608f1a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad53ffc9c0f01eb84d182c32f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 8 17:32:06 2015 +0900 server: Make async objects waitable. --- server/async.c | 20 ++++++++++++++++---- server/event.c | 13 ------------- server/named_pipe.c | 32 ++++---------------------------- server/object.h | 1 - server/sock.c | 46 ++++++++-------------------------------------- 5 files changed, 28 insertions(+), 84 deletions(-) diff --git a/server/async.c b/server/async.c index e1650fe..d2da976 100644 --- a/server/async.c +++ b/server/async.c @@ -41,11 +41,13 @@ struct async unsigned int status; /* current status */ struct timeout_user *timeout; unsigned int timeout_status; /* status to report upon timeout */ + int signaled; struct event *event; async_data_t data; /* data for async I/O call */ }; static void async_dump( struct object *obj, int verbose ); +static int async_signaled( struct object *obj, struct wait_queue_entry *entry ); static void async_destroy( struct object *obj ); static const struct object_ops async_ops = @@ -53,10 +55,10 @@ static const struct object_ops async_ops = sizeof(struct async), /* size */ async_dump, /* dump */ no_get_type, /* get_type */ - no_add_queue, /* add_queue */ - NULL, /* remove_queue */ - NULL, /* signaled */ - NULL, /* satisfied */ + add_queue, /* add_queue */ + remove_queue, /* remove_queue */ + async_signaled, /* signaled */ + no_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ no_map_access, /* map_access */ @@ -114,6 +116,13 @@ static void async_dump( struct object *obj, int verbose ) fprintf( stderr, "Async thread=%p\n", async->thread ); } +static int async_signaled( struct object *obj, struct wait_queue_entry *entry ) +{ + struct async *async = (struct async *)obj; + assert( obj->ops == &async_ops ); + return async->signaled; +} + static void async_destroy( struct object *obj ) { struct async *async = (struct async *)obj; @@ -228,6 +237,7 @@ struct async *create_async( struct thread *thread, struct async_queue *queue, co async->data = *data; async->timeout = NULL; async->queue = (struct async_queue *)grab_object( queue ); + async->signaled = 0; list_add_tail( &queue->queue, &async->queue_entry ); grab_object( async ); @@ -306,6 +316,8 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota } if (async->event) set_event( async->event ); else if (async->queue->fd) set_fd_signaled( async->queue->fd, 1 ); + async->signaled = 1; + wake_up( &async->obj, 0 ); } } diff --git a/server/event.c b/server/event.c index 0daa5b2..4d3c562 100644 --- a/server/event.c +++ b/server/event.c @@ -124,19 +124,6 @@ struct event *create_event( struct directory *root, const struct unicode_str *na return event; } -obj_handle_t alloc_wait_event( struct process *process ) -{ - obj_handle_t handle = 0; - struct event *event = create_event( NULL, NULL, 0, 1, 0, NULL ); - - if (event) - { - handle = alloc_handle( process, event, EVENT_ALL_ACCESS, 0 ); - release_object( event ); - } - return handle; -} - struct event *get_event_obj( struct process *process, obj_handle_t handle, unsigned int access ) { return (struct event *)get_handle_obj( process, handle, access, &event_ops ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 154eeb9..83e2dae 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -614,21 +614,9 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a { case ps_idle_server: case ps_wait_connect: - if (blocking) - { - async_data_t new_data = *async_data; - if (!(wait_handle = alloc_wait_event( current->process ))) break; - new_data.event = wait_handle; - if (!(async = fd_queue_async( server->ioctl_fd, &new_data, ASYNC_TYPE_WAIT ))) - { - close_handle( current->process, wait_handle ); - break; - } - } - else async = fd_queue_async( server->ioctl_fd, async_data, ASYNC_TYPE_WAIT ); - - if (async) + if ((async = fd_queue_async( server->ioctl_fd, async_data, ASYNC_TYPE_WAIT ))) { + if (blocking) wait_handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ); set_server_state( server, ps_wait_open ); if (server->pipe->waiters) async_wake_up( server->pipe->waiters, STATUS_SUCCESS ); release_object( async ); @@ -913,23 +901,11 @@ static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, if (!pipe->waiters && !(pipe->waiters = create_async_queue( NULL ))) goto done; - if (blocking) - { - async_data_t new_data = *async_data; - if (!(wait_handle = alloc_wait_event( current->process ))) goto done; - new_data.event = wait_handle; - if (!(async = create_async( current, pipe->waiters, &new_data ))) - { - close_handle( current->process, wait_handle ); - wait_handle = 0; - } - } - else async = create_async( current, pipe->waiters, async_data ); - - if (async) + if ((async = create_async( current, pipe->waiters, async_data ))) { timeout_t when = buffer->TimeoutSpecified ? buffer->Timeout.QuadPart : pipe->timeout; async_set_timeout( async, when, STATUS_IO_TIMEOUT ); + if (blocking) wait_handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ); release_object( async ); set_error( STATUS_PENDING ); } diff --git a/server/object.h b/server/object.h index 72b52ee..00bef38 100644 --- a/server/object.h +++ b/server/object.h @@ -162,7 +162,6 @@ extern struct event *create_event( struct directory *root, const struct unicode_ const struct security_descriptor *sd ); extern struct keyed_event *create_keyed_event( struct directory *root, const struct unicode_str *name, unsigned int attr, const struct security_descriptor *sd ); -extern obj_handle_t alloc_wait_event( struct process *process ); extern struct event *get_event_obj( struct process *process, obj_handle_t handle, unsigned int access ); extern struct keyed_event *get_keyed_event_obj( struct process *process, obj_handle_t handle, unsigned int access ); extern void pulse_event( struct event *event ); diff --git a/server/sock.c b/server/sock.c index c4dcf6f..67d6416 100644 --- a/server/sock.c +++ b/server/sock.c @@ -120,7 +120,6 @@ struct sock }; static void sock_dump( struct object *obj, int verbose ); -static int sock_add_ifchange( struct sock *sock, const async_data_t *async_data ); static int sock_signaled( struct object *obj, struct wait_queue_entry *entry ); static struct fd *sock_get_fd( struct object *obj ); static void sock_destroy( struct object *obj ); @@ -539,25 +538,19 @@ obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *a { struct sock *sock = get_fd_user( fd ); obj_handle_t wait_handle = 0; - async_data_t new_data; + struct async_queue *ifchange_q; + struct async *async; assert( sock->obj.ops == &sock_ops ); switch(code) { case WS_SIO_ADDRESS_LIST_CHANGE: - if (blocking) - { - if (!(wait_handle = alloc_wait_event( current->process ))) return 0; - new_data = *async_data; - new_data.event = wait_handle; - async_data = &new_data; - } - if (!sock_add_ifchange( sock, async_data ) && wait_handle) - { - close_handle( current->process, wait_handle ); - return 0; - } + if (!(ifchange_q = sock_get_ifchange_q( sock ))) return 0; + if (!(async = create_async( current, ifchange_q, async_data ))) return 0; + if (blocking) wait_handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ); + release_object( async ); + set_error( STATUS_PENDING ); return wait_handle; default: set_error( STATUS_NOT_SUPPORTED ); @@ -962,29 +955,6 @@ static void sock_set_error(void) set_error( sock_get_ntstatus( errno ) ); } -/* add interface change notification to a socket */ -static int sock_add_ifchange( struct sock *sock, const async_data_t *async_data ) -{ - struct async_queue *ifchange_q; - struct async *async; - - if (!(ifchange_q = sock_get_ifchange_q( sock ))) - return 0; - - if (!(async = create_async( current, ifchange_q, async_data ))) - { - if (!async_queued( ifchange_q )) - sock_destroy_ifchange_q( sock ); - - set_error( STATUS_NO_MEMORY ); - return 0; - } - - release_object( async ); - set_error( STATUS_PENDING ); - return 1; -} - #ifdef HAVE_LINUX_RTNETLINK_H /* only keep one ifchange object around, all sockets waiting for wakeups will look to it */ @@ -1204,7 +1174,7 @@ static struct async_queue *sock_get_ifchange_q( struct sock *sock ) return NULL; /* create the ifchange notification queue */ - fd = ifchange->ops->get_fd( ifchange ); + fd = get_obj_fd( ifchange ); sock->ifchange_q = create_async_queue( fd ); release_object( fd ); if (!sock->ifchange_q)

1 0

Alex Henrie : wineps: Make printer setup dialog caption translatable.
by Alexandre Julliard May 8, 2015

May 8, 2015

1 0

Hugh McMaster : cmd.exe: Remove redundant call to SetConsoleMode.
by Alexandre Julliard May 8, 2015

May 8, 2015

Module: wine Branch: master Commit: 27753f2ea606d75193efa1ddc1dd6261ef2342d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27753f2ea606d75193efa1ddc… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu May 7 22:36:52 2015 +1000 cmd.exe: Remove redundant call to SetConsoleMode. --- programs/cmd/wcmdmain.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index bc9b216..36d2ec1 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2593,8 +2593,6 @@ int wmain (int argc, WCHAR *argvW[]) return errorlevel; } - SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), ENABLE_LINE_INPUT | - ENABLE_ECHO_INPUT | ENABLE_PROCESSED_INPUT); SetConsoleTitleW(WCMD_LoadMessage(WCMD_CONSTITLE)); /* Note: cmd.exe /c dir does not get a new color, /k dir does */

1 0

Alexandre Julliard : server: Use the async queue for pipe flush requests.
by Alexandre Julliard May 8, 2015

May 8, 2015

Module: wine Branch: master Commit: 67da7ba597783c18bd6c349d89809e00299e2d20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67da7ba597783c18bd6c349d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 8 18:01:08 2015 +0900 server: Use the async queue for pipe flush requests. --- server/named_pipe.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 83e2dae..c698a87 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -76,7 +76,6 @@ struct pipe_server struct pipe_client *client; /* client that this server is connected to */ struct named_pipe *pipe; struct timeout_user *flush_poll; - struct event *event; unsigned int options; /* pipe options */ unsigned int pipe_flags; }; @@ -361,12 +360,9 @@ static void notify_empty( struct pipe_server *server ) if (!server->flush_poll) return; assert( server->state == ps_connected_server ); - assert( server->event ); remove_timeout_user( server->flush_poll ); server->flush_poll = NULL; - set_event( server->event ); - release_object( server->event ); - server->event = NULL; + fd_async_wake_up( server->fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); } static void do_disconnect( struct pipe_server *server ) @@ -540,40 +536,33 @@ static void check_flushed( void *arg ) { struct pipe_server *server = (struct pipe_server*) arg; - assert( server->event ); if (pipe_data_remaining( server )) { server->flush_poll = add_timeout_user( -TICKS_PER_SEC / 10, check_flushed, server ); } else { - /* notify_empty( server ); */ server->flush_poll = NULL; - set_event( server->event ); - release_object( server->event ); - server->event = NULL; + fd_async_wake_up( server->fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); } } -static obj_handle_t pipe_server_flush( struct fd *fd, const async_data_t *async, int blocking ) +static obj_handle_t pipe_server_flush( struct fd *fd, const async_data_t *async_data, int blocking ) { struct pipe_server *server = get_fd_user( fd ); obj_handle_t handle = 0; + struct async *async; if (!server || server->state != ps_connected_server) return 0; - /* FIXME: if multiple threads flush the same pipe, - maybe should create a list of processes to notify */ - if (server->flush_poll) return 0; + if (!pipe_data_remaining( server )) return 0; - if (pipe_data_remaining( server )) + if ((async = fd_queue_async( server->fd, async_data, ASYNC_TYPE_WAIT ))) { - /* this kind of sux - - there's no unix way to be alerted when a pipe becomes empty */ - server->event = create_event( NULL, NULL, 0, 0, 0, NULL ); - if (!server->event) return 0; - server->flush_poll = add_timeout_user( -TICKS_PER_SEC / 10, check_flushed, server ); - handle = alloc_handle( current->process, server->event, SYNCHRONIZE, 0 ); + /* there's no unix way to be alerted when a pipe becomes empty, so resort to polling */ + if (!server->flush_poll) + server->flush_poll = add_timeout_user( -TICKS_PER_SEC / 10, check_flushed, server ); + if (blocking) handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ); set_error( STATUS_PENDING ); } return handle;

1 0

Ken Thomases : configure: Set the page zero size to 4KiB on OS X to fix building 64-bit Wine.
by Alexandre Julliard May 8, 2015

May 8, 2015

Module: wine Branch: master Commit: faad187e7037859a88fb4ee6fdcda85a139ed400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faad187e7037859a88fb4ee6f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri May 8 00:44:17 2015 -0500 configure: Set the page zero size to 4KiB on OS X to fix building 64-bit Wine. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index d1ab751..e060af8 100755 --- a/configure +++ b/configure @@ -7862,7 +7862,7 @@ uninstall:: APPKIT_LIBS="-framework AppKit" - LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist" + LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-pagezero_size,0x1000,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_pie" >&5 $as_echo_n "checking whether the compiler supports -Wl,-no_pie... " >&6; } if ${ac_cv_cflags__Wl__no_pie+:} false; then : diff --git a/configure.ac b/configure.ac index cb024c5..f529640 100644 --- a/configure.ac +++ b/configure.ac @@ -761,7 +761,7 @@ uninstall:: AC_SUBST(APPLICATIONSERVICES_LIBS,"-framework ApplicationServices") AC_SUBST(CORESERVICES_LIBS,"-framework CoreServices") AC_SUBST(APPKIT_LIBS,"-framework AppKit") - LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist" + LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-pagezero_size,0x1000,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist" WINE_TRY_CFLAGS([-Wl,-no_pie], [LDEXECFLAGS="-Wl,-no_pie $LDEXECFLAGS"]) if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes"

1 0

Martin Storsjo : api-ms-win-core-sysinfo-l1-1-0: Add stub dll.
by Alexandre Julliard May 8, 2015

May 8, 2015

Module: wine Branch: master Commit: fc1dc668650a2d74c84b634a86e1dc3c8368988d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc1dc668650a2d74c84b634a8… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 7 23:03:03 2015 +0300 api-ms-win-core-sysinfo-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-sysinfo-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-sysinfo-l1-1-0.spec | 28 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 33 insertions(+) diff --git a/configure b/configure index d2d3530..d1ab751 100755 --- a/configure +++ b/configure @@ -901,6 +901,7 @@ enable_api_ms_win_core_shlwapi_legacy_l1_1_0 enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_synch_l1_1_0 enable_api_ms_win_core_synch_l1_2_0 +enable_api_ms_win_core_sysinfo_l1_1_0 enable_api_ms_win_core_sysinfo_l1_2_0 enable_api_ms_win_core_sysinfo_l1_2_1 enable_api_ms_win_core_threadpool_legacy_l1_1_0 @@ -17046,6 +17047,7 @@ wine_fn_config_dll api-ms-win-core-shlwapi-legacy-l1-1-0 enable_api_ms_win_core_ wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 wine_fn_config_dll api-ms-win-core-synch-l1-1-0 enable_api_ms_win_core_synch_l1_1_0 wine_fn_config_dll api-ms-win-core-synch-l1-2-0 enable_api_ms_win_core_synch_l1_2_0 +wine_fn_config_dll api-ms-win-core-sysinfo-l1-1-0 enable_api_ms_win_core_sysinfo_l1_1_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-0 enable_api_ms_win_core_sysinfo_l1_2_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-1 enable_api_ms_win_core_sysinfo_l1_2_1 wine_fn_config_dll api-ms-win-core-threadpool-legacy-l1-1-0 enable_api_ms_win_core_threadpool_legacy_l1_1_0 diff --git a/configure.ac b/configure.ac index 31c8147..cb024c5 100644 --- a/configure.ac +++ b/configure.ac @@ -2737,6 +2737,7 @@ WINE_CONFIG_DLL(api-ms-win-core-shlwapi-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-1) WINE_CONFIG_DLL(api-ms-win-core-threadpool-legacy-l1-1-0) diff --git a/dlls/api-ms-win-core-sysinfo-l1-1-0/Makefile.in b/dlls/api-ms-win-core-sysinfo-l1-1-0/Makefile.in new file mode 100644 index 0000000..6345872 --- /dev/null +++ b/dlls/api-ms-win-core-sysinfo-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-sysinfo-l1-1-0.dll diff --git a/dlls/api-ms-win-core-sysinfo-l1-1-0/api-ms-win-core-sysinfo-l1-1-0.spec b/dlls/api-ms-win-core-sysinfo-l1-1-0/api-ms-win-core-sysinfo-l1-1-0.spec new file mode 100644 index 0000000..5044394 --- /dev/null +++ b/dlls/api-ms-win-core-sysinfo-l1-1-0/api-ms-win-core-sysinfo-l1-1-0.spec @@ -0,0 +1,28 @@ +@ stdcall GetComputerNameExA(long ptr ptr) kernel32.GetComputerNameExA +@ stdcall GetComputerNameExW(long ptr ptr) kernel32.GetComputerNameExW +@ stdcall GetDynamicTimeZoneInformation(ptr) kernel32.GetDynamicTimeZoneInformation +@ stdcall GetLocalTime(ptr) kernel32.GetLocalTime +@ stdcall GetLogicalProcessorInformation(ptr ptr) kernel32.GetLogicalProcessorInformation +@ stdcall GetLogicalProcessorInformationEx(long ptr ptr) kernel32.GetLogicalProcessorInformationEx +@ stdcall GetSystemDirectoryA(ptr long) kernel32.GetSystemDirectoryA +@ stdcall GetSystemDirectoryW(ptr long) kernel32.GetSystemDirectoryW +@ stdcall GetSystemInfo(ptr) kernel32.GetSystemInfo +@ stdcall GetSystemTime(ptr) kernel32.GetSystemTime +@ stdcall GetSystemTimeAdjustment(ptr ptr ptr) kernel32.GetSystemTimeAdjustment +@ stdcall GetSystemTimeAsFileTime(ptr) kernel32.GetSystemTimeAsFileTime +@ stdcall GetSystemWindowsDirectoryA(ptr long) kernel32.GetSystemWindowsDirectoryA +@ stdcall GetSystemWindowsDirectoryW(ptr long) kernel32.GetSystemWindowsDirectoryW +@ stdcall -ret64 GetTickCount64() kernel32.GetTickCount64 +@ stdcall GetTickCount() kernel32.GetTickCount +@ stdcall GetTimeZoneInformation(ptr) kernel32.GetTimeZoneInformation +@ stub GetTimeZoneInformationForYear +@ stdcall GetVersion() kernel32.GetVersion +@ stdcall GetVersionExA(ptr) kernel32.GetVersionExA +@ stdcall GetVersionExW(ptr) kernel32.GetVersionExW +@ stdcall GetWindowsDirectoryA(ptr long) kernel32.GetWindowsDirectoryA +@ stdcall GetWindowsDirectoryW(ptr long) kernel32.GetWindowsDirectoryW +@ stdcall GlobalMemoryStatusEx(ptr) kernel32.GlobalMemoryStatusEx +@ stdcall SetLocalTime(ptr) kernel32.SetLocalTime +@ stdcall SystemTimeToFileTime(ptr ptr) kernel32.SystemTimeToFileTime +@ stdcall SystemTimeToTzSpecificLocalTime(ptr ptr ptr) kernel32.SystemTimeToTzSpecificLocalTime +@ stdcall TzSpecificLocalTimeToSystemTime(ptr ptr ptr) kernel32.TzSpecificLocalTimeToSystemTime diff --git a/tools/make_specfiles b/tools/make_specfiles index ef78d11..164d4f0 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -148,6 +148,7 @@ my @dll_groups = "api-ms-win-core-interlocked-l1-2-0", "api-ms-win-core-profile-l1-1-0", "api-ms-win-core-string-l1-1-0", + "api-ms-win-core-sysinfo-l1-1-0", "api-ms-win-core-sysinfo-l1-2-0", "api-ms-win-core-util-l1-1-0", "api-ms-win-core-synch-l1-1-0",

1 0

Nikolay Sivov : ole32/tests: Added a test for OleRun().
by Alexandre Julliard May 8, 2015

May 8, 2015

Module: wine Branch: master Commit: 26a9f62db7a09f0e5478c536793ce31ecdb92f99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26a9f62db7a09f0e5478c5367… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 7 18:56:58 2015 +0300 ole32/tests: Added a test for OleRun(). --- dlls/ole32/tests/ole2.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 0c27bd1..b590d3d 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2074,14 +2074,90 @@ static const IUnknownVtbl UnknownVtbl = Unknown_Release }; +static HRESULT WINAPI OleRun_QueryInterface(IRunnableObject *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IRunnableObject)) { + *ppv = iface; + } + + if (*ppv) + { + IUnknown_AddRef((IUnknown *)*ppv); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI OleRun_AddRef(IRunnableObject *iface) +{ + return 2; +} + +static ULONG WINAPI OleRun_Release(IRunnableObject *iface) +{ + return 1; +} + +static HRESULT WINAPI OleRun_GetRunningClass(IRunnableObject *iface, CLSID *clsid) +{ + ok(0, "unxpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleRun_Run(IRunnableObject *iface, LPBINDCTX ctx) +{ + ok(ctx == NULL, "got %p\n", ctx); + return 0xdeadc0de; +} + +static BOOL WINAPI OleRun_IsRunning(IRunnableObject *iface) +{ + ok(0, "unxpected\n"); + return FALSE; +} + +static HRESULT WINAPI OleRun_LockRunning(IRunnableObject *iface, BOOL lock, + BOOL last_unlock_closes) +{ + ok(0, "unxpected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleRun_SetContainedObject(IRunnableObject *iface, BOOL contained) +{ + ok(0, "unxpected\n"); + return E_NOTIMPL; +} + +static const IRunnableObjectVtbl oleruntestvtbl = +{ + OleRun_QueryInterface, + OleRun_AddRef, + OleRun_Release, + OleRun_GetRunningClass, + OleRun_Run, + OleRun_IsRunning, + OleRun_LockRunning, + OleRun_SetContainedObject +}; + static IUnknown unknown = { &UnknownVtbl }; +static IRunnableObject testrunnable = { &oleruntestvtbl }; static void test_OleRun(void) { HRESULT hr; + /* doesn't support IRunnableObject */ hr = OleRun(&unknown); ok(hr == S_OK, "OleRun failed 0x%08x\n", hr); + + hr = OleRun((IUnknown*)&testrunnable); + ok(hr == 0xdeadc0de, "got 0x%08x\n", hr); } static void test_OleLockRunning(void)

1 0

Martin Storsjo : api-ms-win-core-rtlsupport-l1-1-0: Add stub dll.
by Alexandre Julliard May 8, 2015

May 8, 2015

Module: wine Branch: master Commit: 7af1ef4abe60f25cdd07b28064b6619bd12d5da2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7af1ef4abe60f25cdd07b2806… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 7 23:03:01 2015 +0300 api-ms-win-core-rtlsupport-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-rtlsupport-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-rtlsupport-l1-1-0.spec | 4 ++++ tools/make_specfiles | 1 + 5 files changed, 9 insertions(+) diff --git a/configure b/configure index e4e9d6d..297a9d8 100755 --- a/configure +++ b/configure @@ -895,6 +895,7 @@ enable_api_ms_win_core_processthreads_l1_1_2 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_psapi_l1_1_0 enable_api_ms_win_core_registry_l1_1_0 +enable_api_ms_win_core_rtlsupport_l1_1_0 enable_api_ms_win_core_rtlsupport_l1_2_0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 enable_api_ms_win_core_string_l1_1_0 @@ -17038,6 +17039,7 @@ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-2 enable_api_ms_win_core_ wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_dll api-ms-win-core-psapi-l1-1-0 enable_api_ms_win_core_psapi_l1_1_0 wine_fn_config_dll api-ms-win-core-registry-l1-1-0 enable_api_ms_win_core_registry_l1_1_0 +wine_fn_config_dll api-ms-win-core-rtlsupport-l1-1-0 enable_api_ms_win_core_rtlsupport_l1_1_0 wine_fn_config_dll api-ms-win-core-rtlsupport-l1-2-0 enable_api_ms_win_core_rtlsupport_l1_2_0 wine_fn_config_dll api-ms-win-core-shlwapi-legacy-l1-1-0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 diff --git a/configure.ac b/configure.ac index f2be10e..d8baa5f 100644 --- a/configure.ac +++ b/configure.ac @@ -2731,6 +2731,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-2) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-psapi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-registry-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-shlwapi-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) diff --git a/dlls/api-ms-win-core-rtlsupport-l1-1-0/Makefile.in b/dlls/api-ms-win-core-rtlsupport-l1-1-0/Makefile.in new file mode 100644 index 0000000..74abbc0 --- /dev/null +++ b/dlls/api-ms-win-core-rtlsupport-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-rtlsupport-l1-1-0.dll diff --git a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec new file mode 100644 index 0000000..69136d5 --- /dev/null +++ b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec @@ -0,0 +1,4 @@ +@ stdcall -norelay RtlCaptureContext(ptr) ntdll.RtlCaptureContext +@ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace +@ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory +@ stdcall -register RtlUnwind(ptr ptr ptr ptr) ntdll.RtlUnwind diff --git a/tools/make_specfiles b/tools/make_specfiles index 32af0ce..e8c3b5d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -223,6 +223,7 @@ my @dll_groups = "msvcrt", "ntdll", "ntoskrnl.exe", + "api-ms-win-core-rtlsupport-l1-1-0", "api-ms-win-core-rtlsupport-l1-2-0", ], [

1 0

Martin Storsjo : api-ms-win-core-memory-l1-1-0: Add stub dll.
by Alexandre Julliard May 8, 2015

May 8, 2015

Module: wine Branch: master Commit: a7f43d7c502fd5bc876d388288d0bc680b0d273c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7f43d7c502fd5bc876d38828… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 7 23:02:58 2015 +0300 api-ms-win-core-memory-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-memory-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-memory-l1-1-0.spec | 16 ++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 21 insertions(+) diff --git a/configure b/configure index 6114a32..df94011 100755 --- a/configure +++ b/configure @@ -883,6 +883,7 @@ enable_api_ms_win_core_localization_l1_2_0 enable_api_ms_win_core_localization_l1_2_1 enable_api_ms_win_core_localization_obsolete_l1_1_0 enable_api_ms_win_core_localregistry_l1_1_0 +enable_api_ms_win_core_memory_l1_1_0 enable_api_ms_win_core_memory_l1_1_1 enable_api_ms_win_core_namedpipe_l1_2_0 enable_api_ms_win_core_processenvironment_l1_2_0 @@ -17023,6 +17024,7 @@ wine_fn_config_dll api-ms-win-core-localization-l1-2-0 enable_api_ms_win_core_lo wine_fn_config_dll api-ms-win-core-localization-l1-2-1 enable_api_ms_win_core_localization_l1_2_1 wine_fn_config_dll api-ms-win-core-localization-obsolete-l1-1-0 enable_api_ms_win_core_localization_obsolete_l1_1_0 wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 +wine_fn_config_dll api-ms-win-core-memory-l1-1-0 enable_api_ms_win_core_memory_l1_1_0 wine_fn_config_dll api-ms-win-core-memory-l1-1-1 enable_api_ms_win_core_memory_l1_1_1 wine_fn_config_dll api-ms-win-core-namedpipe-l1-2-0 enable_api_ms_win_core_namedpipe_l1_2_0 wine_fn_config_dll api-ms-win-core-processenvironment-l1-2-0 enable_api_ms_win_core_processenvironment_l1_2_0 diff --git a/configure.ac b/configure.ac index 35202aa..41203bb 100644 --- a/configure.ac +++ b/configure.ac @@ -2719,6 +2719,7 @@ WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-1) WINE_CONFIG_DLL(api-ms-win-core-localization-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-processenvironment-l1-2-0) diff --git a/dlls/api-ms-win-core-memory-l1-1-0/Makefile.in b/dlls/api-ms-win-core-memory-l1-1-0/Makefile.in new file mode 100644 index 0000000..e3d642a --- /dev/null +++ b/dlls/api-ms-win-core-memory-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-memory-l1-1-0.dll diff --git a/dlls/api-ms-win-core-memory-l1-1-0/api-ms-win-core-memory-l1-1-0.spec b/dlls/api-ms-win-core-memory-l1-1-0/api-ms-win-core-memory-l1-1-0.spec new file mode 100644 index 0000000..a524d86 --- /dev/null +++ b/dlls/api-ms-win-core-memory-l1-1-0/api-ms-win-core-memory-l1-1-0.spec @@ -0,0 +1,16 @@ +@ stdcall CreateFileMappingW(long ptr long long long wstr) kernel32.CreateFileMappingW +@ stdcall FlushViewOfFile(ptr long) kernel32.FlushViewOfFile +@ stdcall MapViewOfFile(long long long long long) kernel32.MapViewOfFile +@ stdcall MapViewOfFileEx(long long long long long ptr) kernel32.MapViewOfFileEx +@ stdcall OpenFileMappingW(long long wstr) kernel32.OpenFileMappingW +@ stdcall ReadProcessMemory(long ptr ptr long ptr) kernel32.ReadProcessMemory +@ stdcall UnmapViewOfFile(ptr) kernel32.UnmapViewOfFile +@ stdcall VirtualAlloc(ptr long long long) kernel32.VirtualAlloc +@ stdcall VirtualAllocEx(long ptr long long long) kernel32.VirtualAllocEx +@ stdcall VirtualFree(ptr long long) kernel32.VirtualFree +@ stdcall VirtualFreeEx(long ptr long long) kernel32.VirtualFreeEx +@ stdcall VirtualProtect(ptr long long ptr) kernel32.VirtualProtect +@ stdcall VirtualProtectEx(long ptr long long ptr) kernel32.VirtualProtectEx +@ stdcall VirtualQuery(ptr ptr long) kernel32.VirtualQuery +@ stdcall VirtualQueryEx(long ptr ptr long) kernel32.VirtualQueryEx +@ stdcall WriteProcessMemory(long ptr ptr long ptr) kernel32.WriteProcessMemory diff --git a/tools/make_specfiles b/tools/make_specfiles index 485c219..56198c7 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -162,6 +162,7 @@ my @dll_groups = "api-ms-win-core-kernel32-legacy-l1-1-0", "api-ms-win-core-localization-l1-2-0", "api-ms-win-core-localization-obsolete-l1-1-0", + "api-ms-win-core-memory-l1-1-0", "api-ms-win-core-memory-l1-1-1", "api-ms-win-core-namedpipe-l1-2-0", "api-ms-win-core-processenvironment-l1-2-0",

1 0