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

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

08 May '15

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

Hugh McMaster : cmd.exe: Remove redundant call to SetConsoleMode.
by Alexandre Julliard 08 May '15

08 May '15

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

Alex Henrie : wineps: Make printer setup dialog caption translatable.
by Alexandre Julliard 08 May '15

08 May '15

1 0

Alexandre Julliard : server: Make async objects waitable.
by Alexandre Julliard 08 May '15

08 May '15

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

Alexandre Julliard : server: Use the async queue for pipe flush requests.
by Alexandre Julliard 08 May '15

08 May '15

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

Nikolay Sivov : ole32/tests: Added a test for OleRun().
by Alexandre Julliard 08 May '15

08 May '15

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

Nikolay Sivov : shell32: Added IDispatch support for IShellFolderViewDual3.
by Alexandre Julliard 08 May '15

08 May '15

Module: wine Branch: master Commit: 7ce1813fed11ec657a972e5a4774dcccb128c33c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ce1813fed11ec657a972e5a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 8 07:44:13 2015 +0300 shell32: Added IDispatch support for IShellFolderViewDual3. --- dlls/shell32/shell32_main.h | 10 ++++++++++ dlls/shell32/shelldispatch.c | 13 ++++--------- dlls/shell32/shlview.c | 41 +++++++++++++++++++++++++++++++++-------- 3 files changed, 47 insertions(+), 17 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 954f1e4..18503eb 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -229,6 +229,16 @@ BOOL AddToEnumList(IEnumIDListImpl *list, LPITEMIDLIST pidl) DECLSPEC_HIDDEN; */ BOOL CreateFolderEnumList(IEnumIDListImpl *list, LPCWSTR lpszPath, DWORD dwFlags) DECLSPEC_HIDDEN; +enum tid_t { + NULL_tid, + IShellDispatch6_tid, + IShellFolderViewDual3_tid, + Folder3_tid, + FolderItem2_tid, + LAST_tid +}; + +HRESULT get_typeinfo(enum tid_t, ITypeInfo**) DECLSPEC_HIDDEN; void release_typelib(void) DECLSPEC_HIDDEN; void release_desktop_folder(void) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index e39d0f1..f168477 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -34,23 +34,18 @@ #include "shldisp.h" #include "debughlp.h" +#include "shell32_main.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); -enum tid_t { - NULL_tid, - IShellDispatch6_tid, - Folder3_tid, - FolderItem2_tid, - LAST_tid -}; - static ITypeLib *typelib; static const IID * const tid_ids[] = { &IID_NULL, &IID_IShellDispatch6, + &IID_IShellFolderViewDual3, &IID_Folder3, &IID_FolderItem2 }; @@ -118,7 +113,7 @@ void release_typelib(void) ITypeLib_Release(typelib); } -static HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) +HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) { HRESULT hr; diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 6ddb937..e6691f8 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3483,16 +3483,23 @@ static ULONG WINAPI shellfolderviewdual_Release(IShellFolderViewDual3 *iface) static HRESULT WINAPI shellfolderviewdual_GetTypeInfoCount(IShellFolderViewDual3 *iface, UINT *pctinfo) { IShellViewImpl *This = impl_from_IShellFolderViewDual3(iface); - FIXME("%p\n", This); - return E_NOTIMPL; + TRACE("%p %p\n", This, pctinfo); + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI shellfolderviewdual_GetTypeInfo(IShellFolderViewDual3 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { IShellViewImpl *This = impl_from_IShellFolderViewDual3(iface); - FIXME("%p\n", This); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p,%u,%d,%p)\n", This, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IShellFolderViewDual3_tid, ppTInfo); + if (SUCCEEDED(hr)) + ITypeInfo_AddRef(*ppTInfo); + return hr; } static HRESULT WINAPI shellfolderviewdual_GetIDsOfNames( @@ -3500,8 +3507,16 @@ static HRESULT WINAPI shellfolderviewdual_GetIDsOfNames( cNames, LCID lcid, DISPID *rgDispId) { IShellViewImpl *This = impl_from_IShellFolderViewDual3(iface); - FIXME("%p\n", This); - return E_NOTIMPL; + ITypeInfo *ti; + HRESULT hr; + + TRACE("(%p,%p,%p,%u,%d,%p)\n", This, riid, rgszNames, cNames, lcid, + rgDispId); + + hr = get_typeinfo(IShellFolderViewDual3_tid, &ti); + if (SUCCEEDED(hr)) + hr = ITypeInfo_GetIDsOfNames(ti, rgszNames, cNames, rgDispId); + return hr; } static HRESULT WINAPI shellfolderviewdual_Invoke(IShellFolderViewDual3 *iface, @@ -3510,8 +3525,18 @@ static HRESULT WINAPI shellfolderviewdual_Invoke(IShellFolderViewDual3 *iface, UINT *puArgErr) { IShellViewImpl *This = impl_from_IShellFolderViewDual3(iface); - FIXME("%p\n", This); - return E_NOTIMPL; + ITypeInfo *ti; + HRESULT hr; + + TRACE("(%p,%d,%p,%d,%u,%p,%p,%p,%p)\n", This, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IShellFolderViewDual3_tid, &ti); + if (SUCCEEDED(hr)) + hr = ITypeInfo_Invoke(ti, &This->IShellFolderViewDual3_iface, dispIdMember, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); + return hr; + } static HRESULT WINAPI shellfolderviewdual_get_Application(IShellFolderViewDual3 *iface,

1 0

Nikolay Sivov : explorer: Return desktop shellview interface.
by Alexandre Julliard 08 May '15

08 May '15

Module: wine Branch: master Commit: 3ec3fa5eb7d4eefd3157dfce31dbe561a6cda474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ec3fa5eb7d4eefd3157dfce3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 8 11:41:43 2015 +0300 explorer: Return desktop shellview interface. --- dlls/shell32/tests/shelldispatch.c | 4 ++++ programs/explorer/desktop.c | 15 +++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index f034132..8e2e399 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -631,6 +631,10 @@ if (hr == S_OK) hr = IShellBrowser_QueryInterface(sb, &IID_IDispatch, (void**)&unk); ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + hr = IShellBrowser_QueryActiveShellView(sb, &sv); + ok(hr == S_OK, "got 0x%08x\n", hr); + IShellView_Release(sv); + IShellBrowser_Release(sb2); IShellBrowser_Release(sb); diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 7ee6174..d2a4932 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -141,6 +141,7 @@ struct shellbrowserwindow IWebBrowser2 IWebBrowser2_iface; IServiceProvider IServiceProvider_iface; IShellBrowser IShellBrowser_iface; + IShellView *view; }; static struct shellwindows shellwindows; @@ -2103,8 +2104,11 @@ static HRESULT WINAPI shellbrowser_SendControlMsg(IShellBrowser *iface, UINT id, static HRESULT WINAPI shellbrowser_QueryActiveShellView(IShellBrowser *iface, IShellView **view) { - FIXME("%p\n", view); - return E_NOTIMPL; + TRACE("%p\n", view); + + *view = desktopshellbrowserwindow.view; + IShellView_AddRef(*view); + return S_OK; } static HRESULT WINAPI shellbrowser_OnViewWindowActive(IShellBrowser *iface, IShellView *view) @@ -2143,9 +2147,16 @@ static const IShellBrowserVtbl shellbrowservtbl = { static void desktopshellbrowserwindow_init(void) { + IShellFolder *folder; + desktopshellbrowserwindow.IWebBrowser2_iface.lpVtbl = &webbrowser2vtbl; desktopshellbrowserwindow.IServiceProvider_iface.lpVtbl = &serviceprovidervtbl; desktopshellbrowserwindow.IShellBrowser_iface.lpVtbl = &shellbrowservtbl; + + if (FAILED(SHGetDesktopFolder(&folder))) + return; + + IShellFolder_CreateViewObject(folder, NULL, &IID_IShellView, (void**)&desktopshellbrowserwindow.view); } static void shellwindows_init(void)

1 0

Stefan Dösinger : wined3d: Fix a copy / paste mistake.
by Alexandre Julliard 08 May '15

08 May '15

Module: wine Branch: master Commit: 0356cbfab99e2a3dc815f24af11c712814af60a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0356cbfab99e2a3dc815f24af… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 16:19:15 2015 +0200 wined3d: Fix a copy / paste mistake. --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f2088bf..3090131 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3656,7 +3656,7 @@ BOOL wined3d_format_convert_color_to_float(const struct wined3d_format *format, case WINED3DFMT_R16G16_UNORM: case WINED3DFMT_B10G10R10A2_UNORM: float_color->r = color_to_float(color, format->red_size, format->red_offset); - float_color->g = color_to_float(color, format->green_size, format->green_size); + float_color->g = color_to_float(color, format->green_size, format->green_offset); float_color->b = color_to_float(color, format->blue_size, format->blue_offset); float_color->a = color_to_float(color, format->alpha_size, format->alpha_offset); return TRUE;

1 0

Martin Storsjo : api-ms-win-core-debug-l1-1-0: Add stub dll.
by Alexandre Julliard 08 May '15

08 May '15

Module: wine Branch: master Commit: 8263a1858dba013b60115b55219da21f1d06b4b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8263a1858dba013b60115b552… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 7 23:02:52 2015 +0300 api-ms-win-core-debug-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-debug-l1-1-0/Makefile.in | 1 + dlls/api-ms-win-core-debug-l1-1-0/api-ms-win-core-debug-l1-1-0.spec | 4 ++++ tools/make_specfiles | 1 + 5 files changed, 9 insertions(+) diff --git a/configure b/configure index e942979..b1b95f2 100755 --- a/configure +++ b/configure @@ -858,6 +858,7 @@ enable_api_ms_win_core_com_l1_1_0 enable_api_ms_win_core_console_l1_1_0 enable_api_ms_win_core_datetime_l1_1_0 enable_api_ms_win_core_datetime_l1_1_1 +enable_api_ms_win_core_debug_l1_1_0 enable_api_ms_win_core_debug_l1_1_1 enable_api_ms_win_core_errorhandling_l1_1_1 enable_api_ms_win_core_errorhandling_l1_1_2 @@ -16992,6 +16993,7 @@ wine_fn_config_dll api-ms-win-core-com-l1-1-0 enable_api_ms_win_core_com_l1_1_0 wine_fn_config_dll api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 wine_fn_config_dll api-ms-win-core-datetime-l1-1-0 enable_api_ms_win_core_datetime_l1_1_0 wine_fn_config_dll api-ms-win-core-datetime-l1-1-1 enable_api_ms_win_core_datetime_l1_1_1 +wine_fn_config_dll api-ms-win-core-debug-l1-1-0 enable_api_ms_win_core_debug_l1_1_0 wine_fn_config_dll api-ms-win-core-debug-l1-1-1 enable_api_ms_win_core_debug_l1_1_1 wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-1 enable_api_ms_win_core_errorhandling_l1_1_1 wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-2 enable_api_ms_win_core_errorhandling_l1_1_2 diff --git a/configure.ac b/configure.ac index 688ab26..5c57b31 100644 --- a/configure.ac +++ b/configure.ac @@ -2694,6 +2694,7 @@ WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-2) diff --git a/dlls/api-ms-win-core-debug-l1-1-0/Makefile.in b/dlls/api-ms-win-core-debug-l1-1-0/Makefile.in new file mode 100644 index 0000000..ab9b7ba --- /dev/null +++ b/dlls/api-ms-win-core-debug-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-debug-l1-1-0.dll diff --git a/dlls/api-ms-win-core-debug-l1-1-0/api-ms-win-core-debug-l1-1-0.spec b/dlls/api-ms-win-core-debug-l1-1-0/api-ms-win-core-debug-l1-1-0.spec new file mode 100644 index 0000000..1330ad1 --- /dev/null +++ b/dlls/api-ms-win-core-debug-l1-1-0/api-ms-win-core-debug-l1-1-0.spec @@ -0,0 +1,4 @@ +@ stdcall DebugBreak() kernel32.DebugBreak +@ stdcall IsDebuggerPresent() kernel32.IsDebuggerPresent +@ stdcall OutputDebugStringA(str) kernel32.OutputDebugStringA +@ stdcall OutputDebugStringW(wstr) kernel32.OutputDebugStringW diff --git a/tools/make_specfiles b/tools/make_specfiles index 9fa4440..ce9afcc 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -140,6 +140,7 @@ my @dll_groups = "api-ms-win-downlevel-normaliz-l1-1-0", "api-ms-win-core-processthreads-l1-1-0", "api-ms-win-core-processthreads-l1-1-1", + "api-ms-win-core-debug-l1-1-0", "api-ms-win-core-debug-l1-1-1", "api-ms-win-core-errorhandling-l1-1-1", "api-ms-win-core-interlocked-l1-2-0",

1 0