wine-commits May 2015

wine-commits@winehq.org

2 participants
428 discussions

Piotr Caban : ws2_32: Fix ai_canonname buffer allocation in addrinfo_AtoW.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: 51e77324dd486484948cce4cb58039d8c93b51dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=51e77324dd486484948cce4cb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 8 18:01:58 2015 +0200 ws2_32: Fix ai_canonname buffer allocation in addrinfo_AtoW. --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 10bfd9d..ac81d24 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6120,7 +6120,7 @@ static struct WS_addrinfoW *addrinfo_AtoW(const struct WS_addrinfo *ai) if (ai->ai_canonname) { int len = MultiByteToWideChar(CP_ACP, 0, ai->ai_canonname, -1, NULL, 0); - if (!(ret->ai_canonname = HeapAlloc(GetProcessHeap(), 0, len))) + if (!(ret->ai_canonname = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)))) { HeapFree(GetProcessHeap(), 0, ret); return NULL;

1 0

Francois Gouget : kernel32/tests: Silence some loader and locale traces that generate too many lines.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: 5ea2bdda5dd43cc75b71e3512937a63be1b69de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ea2bdda5dd43cc75b71e3512… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 8 17:46:30 2015 +0200 kernel32/tests: Silence some loader and locale traces that generate too many lines. --- dlls/kernel32/tests/loader.c | 3 ++- dlls/kernel32/tests/locale.c | 14 +++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 4922035..0f9ac38 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1411,7 +1411,8 @@ static DWORD WINAPI semaphore_thread_proc(void *param) while (1) { - trace("%04u: semaphore_thread_proc: still alive\n", GetCurrentThreadId()); + if (winetest_debug > 1) + trace("%04u: semaphore_thread_proc: still alive\n", GetCurrentThreadId()); if (WaitForSingleObject(stop_event, 50) != WAIT_TIMEOUT) break; } diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 95e0ac6..e2ec152 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3137,8 +3137,9 @@ static void test_ConvertDefaultLocale(void) static BOOL CALLBACK langgrp_procA(LGRPID lgrpid, LPSTR lpszNum, LPSTR lpszName, DWORD dwFlags, LONG_PTR lParam) { - trace("%08x, %s, %s, %08x, %08lx\n", - lgrpid, lpszNum, lpszName, dwFlags, lParam); + if (winetest_debug > 1) + trace("%08x, %s, %s, %08x, %08lx\n", + lgrpid, lpszNum, lpszName, dwFlags, lParam); ok(pIsValidLanguageGroup(lgrpid, dwFlags) == TRUE, "Enumerated grp %d not valid (flags %d)\n", lgrpid, dwFlags); @@ -3187,7 +3188,8 @@ static void test_EnumSystemLanguageGroupsA(void) static BOOL CALLBACK enum_func( LPWSTR name, DWORD flags, LPARAM lparam ) { - trace( "%s %x\n", wine_dbgstr_w(name), flags ); + if (winetest_debug > 1) + trace( "%s %x\n", wine_dbgstr_w(name), flags ); return TRUE; } @@ -3212,7 +3214,8 @@ static void test_EnumSystemLocalesEx(void) static BOOL CALLBACK lgrplocale_procA(LGRPID lgrpid, LCID lcid, LPSTR lpszNum, LONG_PTR lParam) { - trace("%08x, %08x, %s, %08lx\n", lgrpid, lcid, lpszNum, lParam); + if (winetest_debug > 1) + trace("%08x, %08x, %s, %08lx\n", lgrpid, lcid, lpszNum, lParam); /* invalid locale enumerated on some platforms */ if (lcid == 0) @@ -3293,7 +3296,8 @@ static void test_SetLocaleInfoA(void) static BOOL CALLBACK luilocale_proc1A(LPSTR value, LONG_PTR lParam) { - trace("%s %08lx\n", value, lParam); + if (winetest_debug > 1) + trace("%s %08lx\n", value, lParam); return(TRUE); }

1 0

Francois Gouget : ddraw/tests: Silence some ddrawmodes traces that generate too many lines.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: 0f3de20ba0cd26af02b911f79eb0b19ae79d3b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3de20ba0cd26af02b911f79… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 8 17:46:05 2015 +0200 ddraw/tests: Silence some ddrawmodes traces that generate too many lines. --- dlls/ddraw/tests/ddrawmodes.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 39b3555..a325f86 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -337,9 +337,10 @@ static void flushdisplaymodes(void) static HRESULT WINAPI enummodescallback(DDSURFACEDESC *lpddsd, void *lpContext) { - trace("Width = %i, Height = %i, bpp = %i, Refresh Rate = %i, Pitch = %i, flags =%02X\n", - lpddsd->dwWidth, lpddsd->dwHeight, U1(lpddsd->ddpfPixelFormat).dwRGBBitCount, - U2(*lpddsd).dwRefreshRate, U1(*lpddsd).lPitch, lpddsd->dwFlags); + if (winetest_debug > 1) + trace("Width = %i, Height = %i, bpp = %i, Refresh Rate = %i, Pitch = %i, flags =%02X\n", + lpddsd->dwWidth, lpddsd->dwHeight, U1(lpddsd->ddpfPixelFormat).dwRGBBitCount, + U2(*lpddsd).dwRefreshRate, U1(*lpddsd).lPitch, lpddsd->dwFlags); /* Check that the pitch is valid if applicable */ if(lpddsd->dwFlags & DDSD_PITCH) @@ -366,9 +367,10 @@ static HRESULT WINAPI enummodescallback(DDSURFACEDESC *lpddsd, void *lpContext) static HRESULT WINAPI enummodescallback_16bit(DDSURFACEDESC *lpddsd, void *lpContext) { - trace("Width = %i, Height = %i, bpp = %i, Refresh Rate = %i, Pitch = %i, flags =%02X\n", - lpddsd->dwWidth, lpddsd->dwHeight, U1(lpddsd->ddpfPixelFormat).dwRGBBitCount, - U2(*lpddsd).dwRefreshRate, U1(*lpddsd).lPitch, lpddsd->dwFlags); + if (winetest_debug > 1) + trace("Width = %i, Height = %i, bpp = %i, Refresh Rate = %i, Pitch = %i, flags =%02X\n", + lpddsd->dwWidth, lpddsd->dwHeight, U1(lpddsd->ddpfPixelFormat).dwRGBBitCount, + U2(*lpddsd).dwRefreshRate, U1(*lpddsd).lPitch, lpddsd->dwFlags); ok(lpddsd->dwFlags == (DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT|DDSD_PITCH|DDSD_REFRESHRATE), "Wrong surface description flags %02X\n", lpddsd->dwFlags);

1 0

Francois Gouget : gdi32/tests: Silence some font traces that generate too many lines.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: 150d9203103c631c00db28c587e0be968af7704a URL: http://source.winehq.org/git/wine.git/?a=commit;h=150d9203103c631c00db28c58… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 8 17:45:33 2015 +0200 gdi32/tests: Silence some font traces that generate too many lines. --- dlls/gdi32/tests/font.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index eff1793..5388df1 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3708,9 +3708,10 @@ static void test_text_metrics(const LOGFONTA *lf, const NEWTEXTMETRICA *ntm) default_char = GET_BE_WORD(tt_os2.usDefaultChar); break_char = GET_BE_WORD(tt_os2.usBreakChar); - trace("font %s charset %u: %x-%x (%x-%x) default %x break %x OS/2 version %u vendor %4.4s\n", - font_name, lf->lfCharSet, os2_first_char, os2_last_char, cmap_first, cmap_last, - default_char, break_char, version, (LPCSTR)&tt_os2.achVendID); + if (winetest_debug > 1) + trace("font %s charset %u: %x-%x (%x-%x) default %x break %x OS/2 version %u vendor %4.4s\n", + font_name, lf->lfCharSet, os2_first_char, os2_last_char, cmap_first, cmap_last, + default_char, break_char, version, (LPCSTR)&tt_os2.achVendID); if (cmap_type == cmap_ms_symbol || (cmap_first >= 0xf000 && cmap_first < 0xf100)) {

1 0

Francois Gouget : urlmon/tests: Silence some protocol traces that generate too many lines.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: 847a3913497eca52c8e78b43b67809df8c4ed8ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=847a3913497eca52c8e78b43b… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 8 17:45:44 2015 +0200 urlmon/tests: Silence some protocol traces that generate too many lines. --- dlls/urlmon/tests/protocol.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 9aadf1e..bfe4439 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -580,7 +580,8 @@ static void call_continue(PROTOCOLDATA *protocol_data) { HRESULT hres; - trace("continue in state %d\n", state); + if (winetest_debug > 1) + trace("continue in state %d\n", state); if(state == STATE_CONNECTING) { if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST || tested_protocol == FTP_TEST) { @@ -761,10 +762,13 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, '0','0','0','0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0','0','0','0','}',0}; static const WCHAR text_plain[] = {'t','e','x','t','/','p','l','a','i','n',0}; - if (ulStatusCode < sizeof(status_names)/sizeof(status_names[0])) - trace( "progress: %s %s\n", status_names[ulStatusCode], wine_dbgstr_w(szStatusText) ); - else - trace( "progress: %u %s\n", ulStatusCode, wine_dbgstr_w(szStatusText) ); + if (winetest_debug > 1) + { + if (ulStatusCode < sizeof(status_names)/sizeof(status_names[0])) + trace( "progress: %s %s\n", status_names[ulStatusCode], wine_dbgstr_w(szStatusText) ); + else + trace( "progress: %u %s\n", ulStatusCode, wine_dbgstr_w(szStatusText) ); + } switch(ulStatusCode) { case BINDSTATUS_MIMETYPEAVAILABLE:

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: 85311c002d110fe3590e5e4cfdbf2f61ca02e551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85311c002d110fe3590e5e4cf… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri May 8 14:02:40 2015 +0300 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 0cd9197..fd969b5 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-02-24 19:18+0300\n" +"PO-Revision-Date: 2015-05-08 14:01+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -8566,10 +8566,8 @@ msgid "Duplex:" msgstr "Dvigubas:" #: wineps.rc:50 -#, fuzzy -#| msgid "&Setup" msgid "Setup" -msgstr "&Nuostatos" +msgstr "Nuostatos" #: wininet.rc:42 wininet.rc:62 msgid "Realm"

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

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 : 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

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

← Newer
1
...
26
27
28
29
30
31
32
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2015