October 2015 - Wine-commits

Austin English : kernel32: Add a stub for CancelSynchronousIo.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: a26a6b877d64effe947b29854d1c3492a5c27e66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a26a6b877d64effe947b29854… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Oct 12 10:29:27 2015 -0500 kernel32: Add a stub for CancelSynchronousIo. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-io-l1-1-1.spec | 2 +- dlls/kernel32/file.c | 19 +++++++++++++++++++ dlls/kernel32/kernel32.spec | 2 +- include/winbase.h | 1 + 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec b/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec index e05728e..73aae1a 100644 --- a/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec +++ b/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec @@ -1,6 +1,6 @@ @ stdcall CancelIo(long) kernel32.CancelIo @ stdcall CancelIoEx(long ptr) kernel32.CancelIoEx -@ stub CancelSynchronousIo +@ stdcall CancelSynchronousIo(long) kernel32.CancelSynchronousIo @ stdcall CreateIoCompletionPort(long long long long) kernel32.CreateIoCompletionPort @ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) kernel32.DeviceIoControl @ stdcall GetOverlappedResult(long ptr ptr long) kernel32.GetOverlappedResult diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index e43829e..ee43b10 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -686,6 +686,25 @@ BOOL WINAPI CancelIo(HANDLE handle) } /*********************************************************************** + * CancelSynchronousIo (KERNEL32.@) + * + * Marks pending synchronous I/O operations issued by the specified thread as cancelled + * + * PARAMS + * handle [I] handle to the thread whose I/O operations should be cancelled + * + * RETURNS + * Success: TRUE. + * Failure: FALSE, check GetLastError(). + */ +BOOL WINAPI CancelSynchronousIo(HANDLE thread) +{ + FIXME("(%p): stub\n", thread); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * _hread (KERNEL32.@) */ LONG WINAPI _hread( HFILE hFile, LPVOID buffer, LONG count) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e0cb154..dfc305b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -210,7 +210,7 @@ @ stub CancelDeviceWakeupRequest @ stdcall CancelIo(long) @ stdcall CancelIoEx(long ptr) -# @ stub CancelSynchronousIo +@ stdcall CancelSynchronousIo(long) # @ stub CancelThreadpoolIo @ stdcall CancelTimerQueueTimer(ptr ptr) @ stdcall CancelWaitableTimer(long) diff --git a/include/winbase.h b/include/winbase.h index dd320c2..25bc593 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1694,6 +1694,7 @@ WINBASEAPI BOOL WINAPI CallNamedPipeW(LPCWSTR,LPVOID,DWORD,LPVOID,DWORD,L #define CallNamedPipe WINELIB_NAME_AW(CallNamedPipe) WINBASEAPI BOOL WINAPI CancelIo(HANDLE); WINBASEAPI BOOL WINAPI CancelIoEx(HANDLE,LPOVERLAPPED); +WINBASEAPI BOOL WINAPI CancelSynchronousIo(HANDLE); WINBASEAPI BOOL WINAPI CancelTimerQueueTimer(HANDLE,HANDLE); WINBASEAPI BOOL WINAPI CancelWaitableTimer(HANDLE); WINBASEAPI BOOL WINAPI CheckNameLegalDOS8Dot3A(const char*,char*,DWORD,BOOL*,BOOL*);

1 0

Nikolay Sivov : regsvr32: Simplify conditional expression (PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 6de871c01b8366dca952b351d0e8b656ba8db45e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6de871c01b8366dca952b351d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 13 13:35:39 2015 +0300 regsvr32: Simplify conditional expression (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/regsvr32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 03d45fa..6338bae 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -296,7 +296,7 @@ int wmain(int argc, WCHAR* argv[]) continue; } - if (!CallInstall || (CallInstall && CallRegister)) + if (!CallInstall || CallRegister) { if(Unregister) res = UnregisterDll(DllName);

1 0

Nikolay Sivov : oledlg: Simplify conditional expression (PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: bd957b6db613f7fdaaa9d1054aab2855da85cd18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd957b6db613f7fdaaa9d1054… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 13 13:40:34 2015 +0300 oledlg: Simplify conditional expression (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledlg/oledlg_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c index 2730562..87df968 100644 --- a/dlls/oledlg/oledlg_main.c +++ b/dlls/oledlg/oledlg_main.c @@ -183,7 +183,7 @@ BOOL WINAPI OleUIAddVerbMenuW(IOleObject *object, LPCWSTR shorttype, LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_OBJECT, resstrW, sizeof(resstrW)/sizeof(WCHAR)); /* no object, or object without enumeration support */ - if (!object || (object && !enumverbs)) { + if (!object || !enumverbs) { InsertMenuW(hMenu, uPos, MF_BYPOSITION|MF_STRING|MF_GRAYED, idmin, resstrW); return FALSE; }

1 0

Nikolay Sivov : advapi32/tests: Simplify conditional expression ( PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 076f50ee6cd024a4c4f7095d0d1567888cbca7f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=076f50ee6cd024a4c4f7095d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 13 13:44:43 2015 +0300 advapi32/tests: Simplify conditional expression (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a5c98df..b171a81 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1686,7 +1686,7 @@ static void test_sid_str(PSID * sid) DWORD acc_size = MAX_PATH; DWORD dom_size = MAX_PATH; ret = LookupAccountSidA (NULL, sid, account, &acc_size, domain, &dom_size, &use); - ok(ret || (!ret && (GetLastError() == ERROR_NONE_MAPPED)), + ok(ret || GetLastError() == ERROR_NONE_MAPPED, "LookupAccountSid(%s) failed: %d\n", str_sid, GetLastError()); if (ret) trace(" %s %s\\%s %d\n", str_sid, domain, account, use);

1 0

Dmitry Timoshkov : mshtml: Add IHTMLEditServices stub implementation.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 3662980f41be2be3e5ae59062e5445edbe240270 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3662980f41be2be3e5ae59062… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 13 14:41:30 2015 +0800 mshtml: Add IHTMLEditServices stub implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 2 + dlls/mshtml/main.c | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/service.c | 137 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/htmldoc.c | 4 ++ 5 files changed, 145 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 2b660df..8e53b8b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4761,6 +4761,8 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) IOleDocumentView_SetInPlaceSite(&This->basedoc.IOleDocumentView_iface, NULL); if(This->undomgr) IOleUndoManager_Release(This->undomgr); + if(This->editsvcs) + IHTMLEditServices_Release(This->editsvcs); if(This->tooltips_hwnd) DestroyWindow(This->tooltips_hwnd); diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 8938f01e..0b6f6ac 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -554,6 +554,7 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IHlinkTarget); X(IID_IHTMLDocument6); X(IID_IHTMLDocument7); + X(IID_IHTMLEditServices); X(IID_IHTMLFramesCollection2); X(IID_IHTMLPrivateWindow); X(IID_IHtmlLoadOptions); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 55375d4..c32824e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -602,6 +602,7 @@ struct HTMLDocumentObj { DOCHOSTUIINFO hostinfo; IOleUndoManager *undomgr; + IHTMLEditServices *editsvcs; HWND hwnd; HWND tooltips_hwnd; diff --git a/dlls/mshtml/service.c b/dlls/mshtml/service.c index 8b2a6b7..d344293 100644 --- a/dlls/mshtml/service.c +++ b/dlls/mshtml/service.c @@ -205,6 +205,131 @@ static IOleUndoManager *create_undomgr(void) return &ret->IOleUndoManager_iface; } +typedef struct { + IHTMLEditServices IHTMLEditServices_iface; + LONG ref; +} editsvcs; + +static inline editsvcs *impl_from_IHTMLEditServices(IHTMLEditServices *iface) +{ + return CONTAINING_RECORD(iface, editsvcs, IHTMLEditServices_iface); +} + +static HRESULT WINAPI editsvcs_QueryInterface(IHTMLEditServices *iface, REFIID riid, void **ppv) +{ + editsvcs *This = impl_from_IHTMLEditServices(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + *ppv = &This->IHTMLEditServices_iface; + } else if(IsEqualGUID(riid, &IID_IHTMLEditServices)) { + *ppv = &This->IHTMLEditServices_iface; + } else { + *ppv = NULL; + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI editsvcs_AddRef(IHTMLEditServices *iface) +{ + editsvcs *This = impl_from_IHTMLEditServices(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI editsvcs_Release(IHTMLEditServices *iface) +{ + editsvcs *This = impl_from_IHTMLEditServices(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI editsvcs_AddDesigner(IHTMLEditServices *iface, + IHTMLEditDesigner *pIDesigner) +{ + editsvcs *This = impl_from_IHTMLEditServices(iface); + FIXME("(%p)->(%p)\n", This, pIDesigner); + return E_NOTIMPL; +} + +static HRESULT WINAPI editsvcs_RemoveDesigner(IHTMLEditServices *iface, + IHTMLEditDesigner *pIDesigner) +{ + editsvcs *This = impl_from_IHTMLEditServices(iface); + FIXME("(%p)->(%p)\n", This, pIDesigner); + return E_NOTIMPL; +} + +static HRESULT WINAPI editsvcs_GetSelectionServices(IHTMLEditServices *iface, + IMarkupContainer *pIContainer, ISelectionServices **ppSelSvc) +{ + editsvcs *This = impl_from_IHTMLEditServices(iface); + FIXME("(%p)->(%p,%p)\n", This, pIContainer, ppSelSvc); + return E_NOTIMPL; +} + +static HRESULT WINAPI editsvcs_MoveToSelectionAnchor(IHTMLEditServices *iface, + IMarkupPointer *pIStartAnchor) +{ + editsvcs *This = impl_from_IHTMLEditServices(iface); + FIXME("(%p)->(%p)\n", This, pIStartAnchor); + return E_NOTIMPL; +} + +static HRESULT WINAPI editsvcs_MoveToSelectionEnd(IHTMLEditServices *iface, + IMarkupPointer *pIEndAnchor) +{ + editsvcs *This = impl_from_IHTMLEditServices(iface); + FIXME("(%p)->(%p)\n", This, pIEndAnchor); + return E_NOTIMPL; +} + +static HRESULT WINAPI editsvcs_SelectRange(IHTMLEditServices *iface, + IMarkupPointer *pStart, IMarkupPointer *pEnd, SELECTION_TYPE eType) +{ + editsvcs *This = impl_from_IHTMLEditServices(iface); + FIXME("(%p)->(%p,%p,%#x)\n", This, pStart, pEnd, eType); + return E_NOTIMPL; +} + +static const IHTMLEditServicesVtbl editsvcsVtbl = { + editsvcs_QueryInterface, + editsvcs_AddRef, + editsvcs_Release, + editsvcs_AddDesigner, + editsvcs_RemoveDesigner, + editsvcs_GetSelectionServices, + editsvcs_MoveToSelectionAnchor, + editsvcs_MoveToSelectionEnd, + editsvcs_SelectRange, +}; + +static IHTMLEditServices *create_editsvcs(void) +{ + editsvcs *ret = heap_alloc(sizeof(*ret)); + + if (ret) { + ret->IHTMLEditServices_iface.lpVtbl = &editsvcsVtbl; + ret->ref = 1; + return &ret->IHTMLEditServices_iface; + } + + return NULL; +} + /********************************************************** * IServiceProvider implementation */ @@ -264,6 +389,18 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG return IWindowForBindingUI_QueryInterface(&This->doc_obj->IWindowForBindingUI_iface, riid, ppv); } + if(IsEqualGUID(&SID_SHTMLEditServices, guidService)) { + TRACE("SID_SHTMLEditServices\n"); + + if(!This->doc_obj->editsvcs) + This->doc_obj->editsvcs = create_editsvcs(); + + if (!This->doc_obj->editsvcs) + return E_OUTOFMEMORY; + + return IHTMLEditServices_QueryInterface(This->doc_obj->editsvcs, riid, ppv); + } + TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); if(This->doc_obj->client) { diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 899cd73..bdb3eb2 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -8498,8 +8498,12 @@ static void test_ServiceProvider(void) hres = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "got 0x%08x\n", hres); ok(iface_cmp((IUnknown*)doc, unk), "got wrong pointer\n"); + IUnknown_Release(unk); + hres = IServiceProvider_QueryService(provider, &SID_SHTMLEditServices, &IID_IHTMLEditServices, (void**)&unk); + ok(hres == S_OK, "QueryService(HTMLEditServices) failed: %08x\n", hres); IUnknown_Release(unk); + IServiceProvider_Release(provider); release_document(doc); }

1 0

Jacek Caban : mshtml/tests: Fixed some tests on win10.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: f986d3a72fdf8aee8eee381d8c8360f36b1b1005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f986d3a72fdf8aee8eee381d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 14:05:29 2015 +0200 mshtml/tests: Fixed some tests on win10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index bdb3eb2..0e7781b 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -872,7 +872,8 @@ static IHlinkFrame HlinkFrame = { &HlinkFrameVtbl }; static HRESULT WINAPI NewWindowManager_QueryInterface(INewWindowManager *iface, REFIID riid, void **ppv) { - ok(0, "unexpected call\n"); + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + *ppv = NULL; return E_NOINTERFACE; } @@ -2983,7 +2984,9 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID return E_NOTIMPL; case 83: + case 101: case 102: + case 132: case 133: case 134: /* TODO */ case 135: @@ -2997,6 +3000,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 180: case 181: case 182: + case 183: return E_NOTIMPL; default:

1 0

Jacek Caban : ieframe/tests: Fixed tests on win10.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: bf8103b4e9f19c17bdd58280c050a8528e1f2bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf8103b4e9f19c17bdd58280c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 14:10:42 2015 +0200 ieframe/tests: Fixed tests on win10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 3e0e760..c8dfa5b 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -452,11 +452,14 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID } }else if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { switch(nCmdID) { + case 63: /* win10 */ case 105: /* TODO */ + case 132: /* win10 */ case 133: /* IE11 */ case 134: /* TODO (IE10) */ case 135: /* IE11 */ case 136: /* TODO (IE10) */ + case 137: /* win10 */ case 138: /* TODO */ case 140: /* TODO (Win7) */ case 144: /* TODO */ @@ -464,6 +467,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 179: /* IE11 */ case 180: /* IE11 */ case 181: /* IE11 */ + case 182: /* win10 */ return E_FAIL; default: ok(0, "unexpected nCmdID %d\n", nCmdID);

1 0

Jactry Zeng : user32: Add driver entry point for FlashWindowEx.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: b007a98e1aa0ef53c4ace658d3c5c088eeb29b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b007a98e1aa0ef53c4ace658d… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Oct 13 13:51:42 2015 +0800 user32: Add driver entry point for FlashWindowEx. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 12 ++++++++++++ dlls/user32/user_private.h | 1 + dlls/user32/win.c | 2 ++ 3 files changed, 15 insertions(+) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index ced8836..59bfc5c 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -134,6 +134,7 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(CreateDesktopWindow); GET_USER_FUNC(CreateWindow); GET_USER_FUNC(DestroyWindow); + GET_USER_FUNC(FlashWindowEx); GET_USER_FUNC(GetDC); GET_USER_FUNC(MsgWaitForMultipleObjectsEx); GET_USER_FUNC(ReleaseDC); @@ -410,6 +411,10 @@ static void CDECL nulldrv_DestroyWindow( HWND hwnd ) { } +static void CDECL nulldrv_FlashWindowEx( FLASHWINFO *info ) +{ +} + static void CDECL nulldrv_GetDC( HDC hdc, HWND hwnd, HWND top_win, const RECT *win_rect, const RECT *top_rect, DWORD flags ) { @@ -546,6 +551,7 @@ static USER_DRIVER null_driver = nulldrv_CreateDesktopWindow, nulldrv_CreateWindow, nulldrv_DestroyWindow, + nulldrv_FlashWindowEx, nulldrv_GetDC, nulldrv_MsgWaitForMultipleObjectsEx, nulldrv_ReleaseDC, @@ -733,6 +739,11 @@ static BOOL CDECL loaderdrv_CreateWindow( HWND hwnd ) return load_driver()->pCreateWindow( hwnd ); } +static void CDECL loaderdrv_FlashWindowEx( FLASHWINFO *info ) +{ + load_driver()->pFlashWindowEx( info ); +} + static void CDECL loaderdrv_GetDC( HDC hdc, HWND hwnd, HWND top_win, const RECT *win_rect, const RECT *top_rect, DWORD flags ) { @@ -795,6 +806,7 @@ static USER_DRIVER lazy_load_driver = loaderdrv_CreateDesktopWindow, loaderdrv_CreateWindow, nulldrv_DestroyWindow, + loaderdrv_FlashWindowEx, loaderdrv_GetDC, nulldrv_MsgWaitForMultipleObjectsEx, nulldrv_ReleaseDC, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index d3affb0..ead7a53 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -96,6 +96,7 @@ typedef struct tagUSER_DRIVER { BOOL (CDECL *pCreateDesktopWindow)(HWND); BOOL (CDECL *pCreateWindow)(HWND); void (CDECL *pDestroyWindow)(HWND); + void (CDECL *pFlashWindowEx)(FLASHWINFO*); void (CDECL *pGetDC)(HDC,HWND,HWND,const RECT *,const RECT *,DWORD); DWORD (CDECL *pMsgWaitForMultipleObjectsEx)(DWORD,const HANDLE*,DWORD,DWORD,DWORD); void (CDECL *pReleaseDC)(HWND,HDC); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index fb320c7..66749e3 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3460,6 +3460,7 @@ BOOL WINAPI FlashWindowEx( PFLASHWINFO pfinfo ) wndPtr->flags &= ~WIN_NCACTIVATED; } WIN_ReleasePtr( wndPtr ); + USER_Driver->pFlashWindowEx( pfinfo ); return TRUE; } else @@ -3476,6 +3477,7 @@ BOOL WINAPI FlashWindowEx( PFLASHWINFO pfinfo ) WIN_ReleasePtr( wndPtr ); SendMessageW( hwnd, WM_NCACTIVATE, wparam, 0 ); + USER_Driver->pFlashWindowEx( pfinfo ); return wparam; } }

1 0

Jactry Zeng : winex11: Implement FlashWindowEx.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: c2dc6f3ef26fb18e7766956ef0a8cbadccc364d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2dc6f3ef26fb18e7766956ef… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Oct 13 13:52:37 2015 +0800 winex11: Implement FlashWindowEx. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 29 +++++++++++++++++++++++++++++ dlls/winex11.drv/winex11.drv.spec | 1 + dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + 4 files changed, 32 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b7ec06e..b763677 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2767,3 +2767,32 @@ failed: release_win_data( data ); return -1; } + +void CDECL X11DRV_FlashWindowEx( PFLASHWINFO pfinfo ) +{ + struct x11drv_win_data *data = get_win_data( pfinfo->hwnd ); + XEvent xev; + + if (!data) + return; + + if (data->mapped) + { + xev.type = ClientMessage; + xev.xclient.window = data->whole_window; + xev.xclient.message_type = x11drv_atom( _NET_WM_STATE ); + xev.xclient.serial = 0; + xev.xclient.display = data->display; + xev.xclient.send_event = True; + xev.xclient.format = 32; + xev.xclient.data.l[0] = pfinfo->dwFlags ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE; + xev.xclient.data.l[1] = x11drv_atom( _NET_WM_STATE_DEMANDS_ATTENTION ); + xev.xclient.data.l[2] = 0; + xev.xclient.data.l[3] = 1; + xev.xclient.data.l[4] = 0; + + XSendEvent( data->display, DefaultRootWindow( data->display ), False, + SubstructureNotifyMask, &xev ); + } + release_win_data( data ); +} diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index d9bbebc..182b351 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -30,6 +30,7 @@ @ cdecl EmptyClipboard() X11DRV_EmptyClipboard @ cdecl EndClipboardUpdate() X11DRV_EndClipboardUpdate @ cdecl EnumClipboardFormats(long) X11DRV_EnumClipboardFormats +@ cdecl FlashWindowEx(ptr) X11DRV_FlashWindowEx @ cdecl GetClipboardData(long) X11DRV_GetClipboardData @ cdecl GetDC(long long long ptr ptr long) X11DRV_GetDC @ cdecl IsClipboardFormatAvailable(long) X11DRV_IsClipboardFormatAvailable diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index cb4b0bb..2694d23 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -421,6 +421,7 @@ enum x11drv_atoms XATOM__NET_WM_PING, XATOM__NET_WM_STATE, XATOM__NET_WM_STATE_ABOVE, + XATOM__NET_WM_STATE_DEMANDS_ATTENTION, XATOM__NET_WM_STATE_FULLSCREEN, XATOM__NET_WM_STATE_MAXIMIZED_HORZ, XATOM__NET_WM_STATE_MAXIMIZED_VERT, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 85c69bf..d4f5c84 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -138,6 +138,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "_NET_WM_PING", "_NET_WM_STATE", "_NET_WM_STATE_ABOVE", + "_NET_WM_STATE_DEMANDS_ATTENTION", "_NET_WM_STATE_FULLSCREEN", "_NET_WM_STATE_MAXIMIZED_HORZ", "_NET_WM_STATE_MAXIMIZED_VERT",

1 0

Nikolay Sivov : msvcirt: Use proper printf format for pointers (PVS-Studio ).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 472f4acb06a35fc2985500deef3ee2c604a6d9da URL: http://source.winehq.org/git/wine.git/?a=commit;h=472f4acb06a35fc2985500dee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 12 21:44:50 2015 +0300 msvcirt: Use proper printf format for pointers (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index f590d0e..09f488a 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -825,8 +825,8 @@ void __thiscall streambuf_dbp(streambuf *this) } else { printf("_fAlloc=%d\n", this->allocated); printf(" base()=%p, ebuf()=%p, blen()=%d\n", this->base, this->ebuf, streambuf_blen(this)); - printf("pbase()=%p, pptr()=%p, epptr()=%d\n", this->pbase, this->pptr, this->epptr); - printf("eback()=%p, gptr()=%p, egptr()=%d\n", this->eback, this->gptr, this->egptr); + printf("pbase()=%p, pptr()=%p, epptr()=%p\n", this->pbase, this->pptr, this->epptr); + printf("eback()=%p, gptr()=%p, egptr()=%p\n", this->eback, this->gptr, this->egptr); } }

1 0