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

Marcus Meissner : oleaut32: Avoid a library handle leak (Coverity).
by Alexandre Julliard 07 May '15

07 May '15

Module: wine Branch: master Commit: f4f8679ae98189b756601679d7be872b22207a60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f8679ae98189b756601679d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed May 6 17:31:27 2015 +0200 oleaut32: Avoid a library handle leak (Coverity). --- dlls/oleaut32/olepropframe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index b89d3a6..73af745 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -210,6 +210,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) if(property_sheet_dialog_data) { if(property_sheet_dialog_data[1] == 0xffff) { ERR("Expected DLGTEMPLATE structure\n"); + FreeLibrary(hcomctl); return E_OUTOFMEMORY; }

1 0

Sebastian Lackner : ntdll/tests: Add/ remove todo_wine to avoid test failures.
by Alexandre Julliard 07 May '15

07 May '15

Module: wine Branch: master Commit: e40e5661ee9a78d83195eb79b347cdc552dc694a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e40e5661ee9a78d83195eb79b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu May 7 01:15:12 2015 +0200 ntdll/tests: Add/remove todo_wine to avoid test failures. --- dlls/ntdll/tests/pipe.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 4bf2ad2..9fadb0f 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -469,13 +469,12 @@ static void test_cancelio(void) ok(res == STATUS_PENDING, "NtFsControlFile returned %x\n", res); res = pNtCancelIoFile(hPipe, &cancel_sb); - todo_wine ok(!res, "NtCancelIoFile returned %x\n", res); + ok(!res, "NtCancelIoFile returned %x\n", res); - todo_wine { - ok(U(iosb).Status == STATUS_CANCELLED, "Wrong iostatus %x\n", U(iosb).Status); - ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n"); - } + ok(U(iosb).Status == STATUS_CANCELLED, "Wrong iostatus %x\n", U(iosb).Status); + ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n"); + todo_wine ok(!ioapc_called, "IOAPC ran too early\n"); SleepEx(0, TRUE); /* alertable wait state */

1 0

Alexandre Julliard : ntdll: Don't run user APCs in NtCancelIoFile.
by Alexandre Julliard 07 May '15

07 May '15

Module: wine Branch: master Commit: 38b7c8839c9a9b6c02a2bf76250cb6f339dfb1e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38b7c8839c9a9b6c02a2bf762… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 7 15:13:34 2015 +0900 ntdll: Don't run user APCs in NtCancelIoFile. --- dlls/ntdll/file.c | 22 ---------------------- dlls/ntdll/tests/file.c | 10 ++++------ dlls/ntdll/tests/pipe.c | 1 - 3 files changed, 4 insertions(+), 29 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index e43ef41..4c6b1b7 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3457,8 +3457,6 @@ NTSTATUS WINAPI NtDeleteFile( POBJECT_ATTRIBUTES ObjectAttributes ) */ NTSTATUS WINAPI NtCancelIoFileEx( HANDLE hFile, PIO_STATUS_BLOCK iosb, PIO_STATUS_BLOCK io_status ) { - LARGE_INTEGER timeout; - TRACE("%p %p %p\n", hFile, iosb, io_status ); SERVER_START_REQ( cancel_async ) @@ -3469,16 +3467,7 @@ NTSTATUS WINAPI NtCancelIoFileEx( HANDLE hFile, PIO_STATUS_BLOCK iosb, PIO_STATU io_status->u.Status = wine_server_call( req ); } SERVER_END_REQ; - if (io_status->u.Status) - return io_status->u.Status; - /* Let some APC be run, so that we can run the remaining APCs on hFile - * either the cancelation of the pending one, but also the execution - * of the queued APC, but not yet run. This is needed to ensure proper - * clean-up of allocated data. - */ - timeout.QuadPart = 0; - NtDelayExecution( TRUE, &timeout ); return io_status->u.Status; } @@ -3489,8 +3478,6 @@ NTSTATUS WINAPI NtCancelIoFileEx( HANDLE hFile, PIO_STATUS_BLOCK iosb, PIO_STATU */ NTSTATUS WINAPI NtCancelIoFile( HANDLE hFile, PIO_STATUS_BLOCK io_status ) { - LARGE_INTEGER timeout; - TRACE("%p %p\n", hFile, io_status ); SERVER_START_REQ( cancel_async ) @@ -3501,16 +3488,7 @@ NTSTATUS WINAPI NtCancelIoFile( HANDLE hFile, PIO_STATUS_BLOCK io_status ) io_status->u.Status = wine_server_call( req ); } SERVER_END_REQ; - if (io_status->u.Status) - return io_status->u.Status; - /* Let some APC be run, so that we can run the remaining APCs on hFile - * either the cancelation of the pending one, but also the execution - * of the queued APC, but not yet run. This is needed to ensure proper - * clean-up of allocated data. - */ - timeout.QuadPart = 0; - NtDelayExecution( TRUE, &timeout ); return io_status->u.Status; } diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index c02c926..19a886a 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -668,7 +668,7 @@ static void read_file_test(void) ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); ok( is_signaled( event ), "event is signaled\n" ); - todo_wine ok( !apc_count, "apc was called\n" ); + ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -694,7 +694,7 @@ static void read_file_test(void) ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); ok( is_signaled( event ), "event is signaled\n" ); - todo_wine ok( !apc_count, "apc was called\n" ); + ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); CloseHandle( handle ); @@ -720,7 +720,7 @@ static void read_file_test(void) ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); ok( is_signaled( event ), "event is signaled\n" ); - todo_wine ok( !apc_count, "apc was called\n" ); + ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); @@ -746,7 +746,7 @@ static void read_file_test(void) ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); ok( is_signaled( event ), "event is signaled\n" ); - todo_wine ok( !apc_count, "apc was called\n" ); + ok( !apc_count, "apc was called\n" ); SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 2, "apc was not called\n" ); @@ -2521,7 +2521,6 @@ static void test_read_write(void) ret = ReadFile(hfile, buf, 0, &bytes, &ovl); /* ReadFile return value depends on Windows version and testing it is not practical */ if (!ret) -todo_wine ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ret = GetLastError(); ok(bytes == 0, "bytes %u\n", bytes); @@ -2552,7 +2551,6 @@ todo_wine ret = ReadFile(hfile, NULL, 0, &bytes, &ovl); /* ReadFile return value depends on Windows version and testing it is not practical */ if (!ret) -todo_wine ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ret = GetLastError(); ok(bytes == 0, "bytes %u\n", bytes); diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 9fadb0f..20d82f4 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -474,7 +474,6 @@ static void test_cancelio(void) ok(U(iosb).Status == STATUS_CANCELLED, "Wrong iostatus %x\n", U(iosb).Status); ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n"); - todo_wine ok(!ioapc_called, "IOAPC ran too early\n"); SleepEx(0, TRUE); /* alertable wait state */

1 0

Alexandre Julliard : ntdll: Fix handling of async cancellation for directory changes.
by Alexandre Julliard 07 May '15

07 May '15

Module: wine Branch: master Commit: 193667ecd7e8543d48d6c2f16cfd0abca818c3c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=193667ecd7e8543d48d6c2f16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 7 16:02:26 2015 +0900 ntdll: Fix handling of async cancellation for directory changes. --- dlls/ntdll/file.c | 113 ++++++++++++++++++++++++---------------------- dlls/ntdll/tests/change.c | 10 ++-- server/change.c | 2 +- 3 files changed, 65 insertions(+), 60 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 4c6b1b7..43e52c6 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1805,73 +1805,78 @@ static NTSTATUS read_changes_apc( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status, void **apc, void **arg ) { struct read_changes_fileio *fileio = user; - NTSTATUS ret; - int size; + int size = 0; - SERVER_START_REQ( read_change ) - { - req->handle = wine_server_obj_handle( fileio->io.handle ); - wine_server_set_reply( req, fileio->data, fileio->data_size ); - ret = wine_server_call( req ); - size = wine_server_reply_size( reply ); - } - SERVER_END_REQ; - - if (ret == STATUS_SUCCESS && fileio->buffer) + if (status == STATUS_ALERTED) { - FILE_NOTIFY_INFORMATION *pfni = fileio->buffer; - int i, left = fileio->buffer_size; - DWORD *last_entry_offset = NULL; - struct filesystem_event *event = (struct filesystem_event*)fileio->data; - - while (size && left >= sizeof(*pfni)) + SERVER_START_REQ( read_change ) { - /* convert to an NT style path */ - for (i=0; i<event->len; i++) - if (event->name[i] == '/') event->name[i] = '\\'; - - pfni->Action = event->action; - pfni->FileNameLength = ntdll_umbstowcs( 0, event->name, event->len, pfni->FileName, - (left - offsetof(FILE_NOTIFY_INFORMATION, FileName)) / sizeof(WCHAR)); - last_entry_offset = &pfni->NextEntryOffset; - - if (pfni->FileNameLength == -1 || pfni->FileNameLength == -2) break; - - i = offsetof(FILE_NOTIFY_INFORMATION, FileName[pfni->FileNameLength]); - pfni->FileNameLength *= sizeof(WCHAR); - pfni->NextEntryOffset = i; - pfni = (FILE_NOTIFY_INFORMATION*)((char*)pfni + i); - left -= i; - - i = (offsetof(struct filesystem_event, name[event->len]) - + sizeof(int)-1) / sizeof(int) * sizeof(int); - event = (struct filesystem_event*)((char*)event + i); - size -= i; + req->handle = wine_server_obj_handle( fileio->io.handle ); + wine_server_set_reply( req, fileio->data, fileio->data_size ); + status = wine_server_call( req ); + size = wine_server_reply_size( reply ); } + SERVER_END_REQ; - if (size) + if (status == STATUS_SUCCESS && fileio->buffer) { - ret = STATUS_NOTIFY_ENUM_DIR; - size = 0; + FILE_NOTIFY_INFORMATION *pfni = fileio->buffer; + int i, left = fileio->buffer_size; + DWORD *last_entry_offset = NULL; + struct filesystem_event *event = (struct filesystem_event*)fileio->data; + + while (size && left >= sizeof(*pfni)) + { + /* convert to an NT style path */ + for (i = 0; i < event->len; i++) + if (event->name[i] == '/') event->name[i] = '\\'; + + pfni->Action = event->action; + pfni->FileNameLength = ntdll_umbstowcs( 0, event->name, event->len, pfni->FileName, + (left - offsetof(FILE_NOTIFY_INFORMATION, FileName)) / sizeof(WCHAR)); + last_entry_offset = &pfni->NextEntryOffset; + + if (pfni->FileNameLength == -1 || pfni->FileNameLength == -2) break; + + i = offsetof(FILE_NOTIFY_INFORMATION, FileName[pfni->FileNameLength]); + pfni->FileNameLength *= sizeof(WCHAR); + pfni->NextEntryOffset = i; + pfni = (FILE_NOTIFY_INFORMATION*)((char*)pfni + i); + left -= i; + + i = (offsetof(struct filesystem_event, name[event->len]) + + sizeof(int)-1) / sizeof(int) * sizeof(int); + event = (struct filesystem_event*)((char*)event + i); + size -= i; + } + + if (size) + { + status = STATUS_NOTIFY_ENUM_DIR; + size = 0; + } + else + { + if (last_entry_offset) *last_entry_offset = 0; + size = fileio->buffer_size - left; + } } else { - *last_entry_offset = 0; - size = fileio->buffer_size - left; + status = STATUS_NOTIFY_ENUM_DIR; + size = 0; } } - else + + if (status != STATUS_PENDING) { - ret = STATUS_NOTIFY_ENUM_DIR; - size = 0; + iosb->u.Status = status; + iosb->Information = size; + *apc = fileio->io.apc; + *arg = fileio->io.apc_arg; + release_fileio( &fileio->io ); } - - iosb->u.Status = ret; - iosb->Information = size; - *apc = fileio->io.apc; - *arg = fileio->io.apc_arg; - release_fileio( &fileio->io ); - return ret; + return status; } #define FILE_NOTIFY_ALL ( \ diff --git a/dlls/ntdll/tests/change.c b/dlls/ntdll/tests/change.c index 84e281c..0e76fb5 100644 --- a/dlls/ntdll/tests/change.c +++ b/dlls/ntdll/tests/change.c @@ -99,19 +99,19 @@ static void test_ntncdf(void) r = pNtNotifyChangeDirectoryFile(hdir,hEvent,NULL,NULL,&iosb,buffer,sizeof buffer,filter,0); ok(r==STATUS_PENDING, "should return status pending\n"); - r = WaitForSingleObject( hEvent, 0 ); + r = WaitForSingleObject( hEvent, 100 ); ok( r == STATUS_TIMEOUT, "should timeout\n" ); - r = WaitForSingleObject( hdir, 0 ); + r = WaitForSingleObject( hdir, 100 ); ok( r == STATUS_TIMEOUT, "should timeout\n" ); r = CreateDirectoryW( subdir, NULL ); ok( r == TRUE, "failed to create directory\n"); - r = WaitForSingleObject( hdir, 0 ); + r = WaitForSingleObject( hdir, 100 ); ok( r == STATUS_TIMEOUT, "should timeout\n" ); - r = WaitForSingleObject( hEvent, 0 ); + r = WaitForSingleObject( hEvent, 100 ); ok( r == WAIT_OBJECT_0, "event should be ready\n" ); ok( U(iosb).Status == STATUS_SUCCESS, "information wrong\n"); @@ -299,7 +299,7 @@ static void test_ntncdf_async(void) CloseHandle(hdir); ok(U(iosb).Status == STATUS_SUCCESS, "status wrong\n"); - todo_wine ok(U(iosb2).Status == STATUS_CANCELLED, "status wrong\n"); + ok(U(iosb2).Status == STATUS_CANCELLED, "status wrong %x\n",U(iosb2).Status); ok(iosb.Information == 0, "info wrong\n"); ok(iosb2.Information == 0, "info wrong\n"); diff --git a/server/change.c b/server/change.c index 08cee9b..11d9b93 100644 --- a/server/change.c +++ b/server/change.c @@ -272,7 +272,7 @@ void sigio_callback(void) LIST_FOR_EACH_ENTRY( dir, &change_list, struct dir, entry ) { if (interlocked_xchg( &dir->notified, 0 )) - fd_async_wake_up( dir->fd, ASYNC_TYPE_WAIT, STATUS_NOTIFY_ENUM_DIR ); + fd_async_wake_up( dir->fd, ASYNC_TYPE_WAIT, STATUS_ALERTED ); } }

1 0

Alexandre Julliard : user32/tests: Update some todos for changed test failure behavior.
by Alexandre Julliard 07 May '15

07 May '15

Module: wine Branch: master Commit: 7f956031bb4f493e7fde9ff30517a30eb13eb756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f956031bb4f493e7fde9ff30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 7 22:28:41 2015 +0900 user32/tests: Update some todos for changed test failure behavior. --- dlls/user32/tests/winstation.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index c09ebb1..30c56c3 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -880,7 +880,10 @@ static void test_foregroundwindow(void) if (input_desk_id == thread_desk_id) { ok(ret, "SetForegroundWindow failed!\n"); - ok(hwnd == hwnd_test , "unexpected foreground window %p\n", hwnd); + if (hwnd) + ok(hwnd == hwnd_test , "unexpected foreground window %p\n", hwnd); + else + todo_wine ok(hwnd == hwnd_test , "unexpected foreground window %p\n", hwnd); } else { @@ -893,12 +896,18 @@ static void test_foregroundwindow(void) if (input_desk_id == thread_desk_id) { ok(!ret, "SetForegroundWindow should fail!\n"); - ok(hwnd == partners[input_desk_id] , "unexpected foreground window %p\n", hwnd); + if (hwnd) + ok(hwnd == partners[input_desk_id] , "unexpected foreground window %p\n", hwnd); + else + todo_wine ok(hwnd == partners[input_desk_id] , "unexpected foreground window %p\n", hwnd); } else { todo_wine ok(!ret, "SetForegroundWindow should fail!\n"); - todo_wine ok(hwnd == 0, "unexpected foreground window %p\n", hwnd); + if (!hwnd) + ok(hwnd == 0, "unexpected foreground window %p\n", hwnd); + else + todo_wine ok(hwnd == 0, "unexpected foreground window %p\n", hwnd); } } }

1 0

Qian Hong : server: Remove useless trailing comma in array.
by Alexandre Julliard 07 May '15

07 May '15

Module: wine Branch: master Commit: 10d35121db5973c7dec8f4deeca771feb131875c URL: http://source.winehq.org/git/wine.git/?a=commit;h=10d35121db5973c7dec8f4dee… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu May 7 14:31:12 2015 +0800 server: Remove useless trailing comma in array. --- server/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/directory.c b/server/directory.c index e5e82b0..7c5e7db 100644 --- a/server/directory.c +++ b/server/directory.c @@ -369,7 +369,7 @@ void init_directories(void) static const WCHAR dir_basenamedW[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s'}; static const WCHAR dir_named_pipeW[] = {'\\','D','e','v','i','c','e','\\','N','a','m','e','d','P','i','p','e'}; static const WCHAR dir_mailslotW[] = {'\\','D','e','v','i','c','e','\\','M','a','i','l','S','l','o','t'}; - static const WCHAR dir_objtypeW[] = {'O','b','j','e','c','t','T','y','p','e','s',}; + static const WCHAR dir_objtypeW[] = {'O','b','j','e','c','t','T','y','p','e','s'}; static const WCHAR dir_sessionsW[] = {'S','e','s','s','i','o','n','s'}; static const WCHAR dir_kernelW[] = {'K','e','r','n','e','l','O','b','j','e','c','t','s'}; static const struct unicode_str dir_global_str = {dir_globalW, sizeof(dir_globalW)};

1 0

Nikolay Sivov : include: Fix IAccessible definition.
by Alexandre Julliard 07 May '15

07 May '15

Module: wine Branch: master Commit: 39a5a1c6969f6d8013ba5a153d6df9bf3a7ff46f URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a5a1c6969f6d8013ba5a153… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 7 09:13:30 2015 +0300 include: Fix IAccessible definition. --- include/oleacc.idl | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/include/oleacc.idl b/include/oleacc.idl index dc7af15..9edfdda 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -154,10 +154,11 @@ typedef enum AnnoScope } AnnoScope; [ - local, - object, - uuid(618736e0-3c3d-11cf-810c-00aa00389b71), - pointer_default(unique) + object, + hidden, + dual, + uuid(618736e0-3c3d-11cf-810c-00aa00389b71), + pointer_default(unique) ] interface IAccessible : IDispatch { @@ -185,26 +186,26 @@ interface IAccessible : IDispatch [hidden, propget, id(DISPID_ACC_PARENT)] HRESULT accParent([out, retval]IDispatch** ppdispParent); [hidden, propget, id(DISPID_ACC_CHILDCOUNT)] HRESULT accChildCount([out, retval] long* pcountChildren); [hidden, propget, id(DISPID_ACC_CHILD)] HRESULT accChild([in] VARIANT varChildID, [out, retval]IDispatch **ppdispChild); - [hidden, propget, id(DISPID_ACC_NAME)] HRESULT accName([in]VARIANT varID, [out, retval] BSTR* pszName); - [hidden, propget, id(DISPID_ACC_VALUE)] HRESULT accValue([in]VARIANT varID, [out, retval] BSTR* pszValue); - [hidden, propget, id(DISPID_ACC_DESCRIPTION)] HRESULT accDescription([in]VARIANT varID, [out, retval] BSTR* pszDescription); - [hidden, propget, id(DISPID_ACC_ROLE)] HRESULT accRole([in]VARIANT varID, [out, retval]VARIANT* pvarRole); - [hidden, propget, id(DISPID_ACC_STATE)] HRESULT accState([in]VARIANT varID, [out, retval]VARIANT* pvarState); - [hidden, propget, id(DISPID_ACC_HELP)] HRESULT accHelp([in]VARIANT varID, [out, retval]BSTR* pszHelp); - [hidden, propget, id(DISPID_ACC_HELPTOPIC)] HRESULT accHelpTopic([out]BSTR* pszHelpFile, [in]VARIANT varID, [out, retval] long* pidTopic); - [hidden, propget, id(DISPID_ACC_KEYBOARDSHORTCUT)] HRESULT accKeyboardShortcut([in]VARIANT varID, [out, retval] BSTR* pszKeyboardShortcut); + [hidden, propget, id(DISPID_ACC_NAME)] HRESULT accName([in, optional] VARIANT varID, [out, retval] BSTR* pszName); + [hidden, propget, id(DISPID_ACC_VALUE)] HRESULT accValue([in, optional] VARIANT varID, [out, retval] BSTR* pszValue); + [hidden, propget, id(DISPID_ACC_DESCRIPTION)] HRESULT accDescription([in, optional] VARIANT varID, [out, retval] BSTR *description); + [hidden, propget, id(DISPID_ACC_ROLE)] HRESULT accRole([in, optional] VARIANT varID, [out, retval] VARIANT *role); + [hidden, propget, id(DISPID_ACC_STATE)] HRESULT accState([in, optional] VARIANT varID, [out, retval] VARIANT *state); + [hidden, propget, id(DISPID_ACC_HELP)] HRESULT accHelp([in, optional] VARIANT varID, [out, retval] BSTR *help); + [hidden, propget, id(DISPID_ACC_HELPTOPIC)] HRESULT accHelpTopic([out] BSTR *helpfile, [in, optional] VARIANT varID, [out, retval] long* pidTopic); + [hidden, propget, id(DISPID_ACC_KEYBOARDSHORTCUT)] HRESULT accKeyboardShortcut([in, optional] VARIANT varID, [out, retval] BSTR *shortcut); [hidden, propget, id(DISPID_ACC_FOCUS)] HRESULT accFocus([out, retval] VARIANT* pvarID); [hidden, propget, id(DISPID_ACC_SELECTION)] HRESULT accSelection([out, retval] VARIANT* pvarID); - [hidden, propget, id(DISPID_ACC_DEFAULTACTION)] HRESULT accDefaultAction([in]VARIANT varID, [out, retval] BSTR* pszDefaultAction); + [hidden, propget, id(DISPID_ACC_DEFAULTACTION)] HRESULT accDefaultAction([in, optional] VARIANT varID, [out, retval] BSTR *action); - [hidden, id(DISPID_ACC_SELECT)] HRESULT accSelect([in]long flagsSelect, [in]VARIANT varID); - [hidden, id(DISPID_ACC_LOCATION)] HRESULT accLocation([out]long* pxLeft, [out]long* pyTop, [out]long* pcxWidth, [out]long* pcyHeight, [in]VARIANT varID); - [hidden, id(DISPID_ACC_NAVIGATE)] HRESULT accNavigate([in]long navDir, [in]VARIANT varStart, [out, retval] VARIANT* pvarEnd); - [hidden, id(DISPID_ACC_HITTEST)] HRESULT accHitTest([in]long xLeft, [in]long yTop, [out,retval] VARIANT* pvarID); - [hidden, id(DISPID_ACC_DODEFAULTACTION)] HRESULT accDoDefaultAction([in]VARIANT varID); + [hidden, id(DISPID_ACC_SELECT)] HRESULT accSelect([in] long flagsSelect, [in, optional] VARIANT varID); + [hidden, id(DISPID_ACC_LOCATION)] HRESULT accLocation([out] long *left, [out] long *top, [out] long *width, [out] long *height, [in, optional] VARIANT varID); + [hidden, id(DISPID_ACC_NAVIGATE)] HRESULT accNavigate([in] long dir, [in, optional] VARIANT varStart, [out, retval] VARIANT *pvarEnd); + [hidden, id(DISPID_ACC_HITTEST)] HRESULT accHitTest([in] long left, [in] long top, [out, retval] VARIANT *pvarID); + [hidden, id(DISPID_ACC_DODEFAULTACTION)] HRESULT accDoDefaultAction([in, optional] VARIANT varID); - [hidden, propput, id(DISPID_ACC_NAME)] HRESULT accName([in]VARIANT varID, [in]BSTR pszName); - [hidden, propput, id(DISPID_ACC_VALUE)] HRESULT accValue([in]VARIANT varID, [out, retval]BSTR pszValue); + [hidden, propput, id(DISPID_ACC_NAME)] HRESULT accName([in, optional] VARIANT varID, [in] BSTR name); + [hidden, propput, id(DISPID_ACC_VALUE)] HRESULT accValue([in, optional] VARIANT varID, [in] BSTR value); } [

1 0

Nikolay Sivov : oleaut32: Simplify connection point creation.
by Alexandre Julliard 07 May '15

07 May '15

Module: wine Branch: master Commit: 72eaeb14a6021aacf88d7189bdb2a4177e8c5ba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72eaeb14a6021aacf88d7189b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 7 10:39:11 2015 +0300 oleaut32: Simplify connection point creation. --- dlls/oleaut32/connpt.c | 46 ++++++++++++++++------------------------------ 1 file changed, 16 insertions(+), 30 deletions(-) diff --git a/dlls/oleaut32/connpt.c b/dlls/oleaut32/connpt.c index 1d7b05c..5e15e08 100644 --- a/dlls/oleaut32/connpt.c +++ b/dlls/oleaut32/connpt.c @@ -66,9 +66,6 @@ typedef struct ConnectionPointImpl { DWORD nSinks; } ConnectionPointImpl; -static const IConnectionPointVtbl ConnectionPointImpl_VTable; - - /************************************************************************ * Implementation of IEnumConnections */ @@ -105,26 +102,6 @@ static inline EnumConnectionsImpl *impl_from_IEnumConnections(IEnumConnections * } /************************************************************************ - * ConnectionPointImpl_Construct - */ -static ConnectionPointImpl *ConnectionPointImpl_Construct(IUnknown *pUnk, - REFIID riid) -{ - ConnectionPointImpl *Obj; - - Obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*Obj)); - Obj->IConnectionPoint_iface.lpVtbl = &ConnectionPointImpl_VTable; - Obj->Obj = pUnk; - Obj->ref = 1; - Obj->iid = *riid; - Obj->maxSinks = MAXSINKS; - Obj->sinks = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(IUnknown*) * MAXSINKS); - Obj->nSinks = 0; - return Obj; -} - -/************************************************************************ * ConnectionPointImpl_Destroy */ static void ConnectionPointImpl_Destroy(ConnectionPointImpl *Obj) @@ -615,13 +592,22 @@ HRESULT CreateConnectionPoint(IUnknown *pUnk, REFIID riid, IConnectionPoint **pCP) { ConnectionPointImpl *Obj; - HRESULT hr; - Obj = ConnectionPointImpl_Construct(pUnk, riid); - if(!Obj) return E_OUTOFMEMORY; + TRACE("(%p %s %p)\n", pUnk, debugstr_guid(riid), pCP); - hr = IConnectionPoint_QueryInterface(&Obj->IConnectionPoint_iface, - &IID_IConnectionPoint, (void**)pCP); - IConnectionPoint_Release(&Obj->IConnectionPoint_iface); - return hr; + *pCP = NULL; + Obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*Obj)); + if (!Obj) + return E_OUTOFMEMORY; + + Obj->IConnectionPoint_iface.lpVtbl = &ConnectionPointImpl_VTable; + Obj->Obj = pUnk; + Obj->ref = 1; + Obj->iid = *riid; + Obj->maxSinks = MAXSINKS; + Obj->sinks = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IUnknown*) * MAXSINKS); + Obj->nSinks = 0; + + *pCP = &Obj->IConnectionPoint_iface; + return S_OK; }

1 0

Nikolay Sivov : oleaut32: Cleanup connection point methods a bit.
by Alexandre Julliard 07 May '15

07 May '15

Module: wine Branch: master Commit: f07c9784db148e158dc118163ad5f5bde6f9ad4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f07c9784db148e158dc118163… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 7 10:56:46 2015 +0300 oleaut32: Cleanup connection point methods a bit. --- dlls/oleaut32/connpt.c | 47 ++++++++++++++--------------------------------- 1 file changed, 14 insertions(+), 33 deletions(-) diff --git a/dlls/oleaut32/connpt.c b/dlls/oleaut32/connpt.c index 5e15e08..0405d38 100644 --- a/dlls/oleaut32/connpt.c +++ b/dlls/oleaut32/connpt.c @@ -118,7 +118,6 @@ static void ConnectionPointImpl_Destroy(ConnectionPointImpl *Obj) return; } -static ULONG WINAPI ConnectionPointImpl_AddRef(IConnectionPoint* iface); /************************************************************************ * ConnectionPointImpl_QueryInterface (IUnknown) * @@ -135,7 +134,7 @@ static HRESULT WINAPI ConnectionPointImpl_QueryInterface( /* * Perform a sanity check on the parameters. */ - if ( (This==0) || (ppvObject==0) ) + if (!ppvObject) return E_INVALIDARG; /* @@ -143,28 +142,20 @@ static HRESULT WINAPI ConnectionPointImpl_QueryInterface( */ *ppvObject = 0; - /* - * Compare the riid with the interface IDs implemented by this object. - */ - if (IsEqualIID(&IID_IUnknown, riid)) - *ppvObject = This; - else if (IsEqualIID(&IID_IConnectionPoint, riid)) - *ppvObject = This; + + if (IsEqualIID(&IID_IConnectionPoint, riid) || IsEqualIID(&IID_IUnknown, riid)) + *ppvObject = iface; /* * Check that we obtained an interface. */ if ((*ppvObject)==0) { - FIXME("() : asking for un supported interface %s\n",debugstr_guid(riid)); + FIXME("() : asking for unsupported interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } - /* - * Query Interface always increases the reference count by one when it is - * successful - */ - ConnectionPointImpl_AddRef(&This->IConnectionPoint_iface); + IUnknown_AddRef((IUnknown*)*ppvObject); return S_OK; } @@ -320,9 +311,9 @@ static HRESULT WINAPI ConnectionPointImpl_EnumConnections( /* Bump the ref count of this object up by one. It gets Released in IEnumConnections_Release */ - IUnknown_AddRef((IUnknown*)This); + IConnectionPoint_AddRef(iface); - EnumObj = EnumConnectionsImpl_Construct((IUnknown*)This, This->nSinks, pCD); + EnumObj = EnumConnectionsImpl_Construct((IUnknown*)iface, This->nSinks, pCD); hr = IEnumConnections_QueryInterface(&EnumObj->IEnumConnections_iface, &IID_IEnumConnections, (void**)ppEnum); IEnumConnections_Release(&EnumObj->IEnumConnections_iface); @@ -345,7 +336,6 @@ static const IConnectionPointVtbl ConnectionPointImpl_VTable = static const IEnumConnectionsVtbl EnumConnectionsImpl_VTable; -static ULONG WINAPI EnumConnectionsImpl_AddRef(IEnumConnections* iface); /************************************************************************ * EnumConnectionsImpl_Construct @@ -402,7 +392,7 @@ static HRESULT WINAPI EnumConnectionsImpl_QueryInterface( /* * Perform a sanity check on the parameters. */ - if ( (This==0) || (ppvObject==0) ) + if (!ppvObject) return E_INVALIDARG; /* @@ -410,28 +400,19 @@ static HRESULT WINAPI EnumConnectionsImpl_QueryInterface( */ *ppvObject = 0; - /* - * Compare the riid with the interface IDs implemented by this object. - */ - if (IsEqualIID(&IID_IUnknown, riid)) - *ppvObject = This; - else if (IsEqualIID(&IID_IEnumConnections, riid)) - *ppvObject = This; + if (IsEqualIID(&IID_IEnumConnections, riid) || IsEqualIID(&IID_IUnknown, riid)) + *ppvObject = iface; /* * Check that we obtained an interface. */ if ((*ppvObject)==0) { - FIXME("() : asking for un supported interface %s\n",debugstr_guid(riid)); + FIXME("() : asking for unsupported interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } - /* - * Query Interface always increases the reference count by one when it is - * successful - */ - EnumConnectionsImpl_AddRef((IEnumConnections*)This); + IUnknown_AddRef((IUnknown*)*ppvObject); return S_OK; } @@ -558,7 +539,7 @@ static HRESULT WINAPI EnumConnectionsImpl_Clone(IEnumConnections* iface, newObj = EnumConnectionsImpl_Construct(This->pUnk, This->nConns, This->pCD); newObj->nCur = This->nCur; - *ppEnum = (LPENUMCONNECTIONS)newObj; + *ppEnum = &newObj->IEnumConnections_iface; IUnknown_AddRef(This->pUnk); return S_OK; }

1 0

Nikolay Sivov : oleaut32: Implement proxy/stub for IEnumConnections::Next( ).
by Alexandre Julliard 07 May '15

07 May '15

Module: wine Branch: master Commit: 25b689cf1cc79c4be2f58b4db1135cc7e6691416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b689cf1cc79c4be2f58b4db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 7 11:05:26 2015 +0300 oleaut32: Implement proxy/stub for IEnumConnections::Next(). --- dlls/oleaut32/usrmarshal.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 3187ca2..4db2b76 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -2201,8 +2201,14 @@ HRESULT CALLBACK IEnumConnections_Next_Proxy( LPCONNECTDATA rgcd, ULONG *pcFetched) { - FIXME("not implemented\n"); - return E_NOTIMPL; + ULONG fetched; + + TRACE("(%u, %p %p)\n", cConnections, rgcd, pcFetched); + + if (!pcFetched) + pcFetched = &fetched; + + return IEnumConnections_RemoteNext_Proxy(This, cConnections, rgcd, pcFetched); } HRESULT __RPC_STUB IEnumConnections_Next_Stub( @@ -2211,8 +2217,16 @@ HRESULT __RPC_STUB IEnumConnections_Next_Stub( LPCONNECTDATA rgcd, ULONG *pcFetched) { - FIXME("not implemented\n"); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%u, %p, %p)\n", cConnections, rgcd, pcFetched); + + *pcFetched = 0; + hr = IEnumConnections_Next(This, cConnections, rgcd, pcFetched); + if (hr == S_OK) + *pcFetched = cConnections; + + return hr; } HRESULT CALLBACK IEnumConnectionPoints_Next_Proxy(

1 0