wine-commits August 2006

wine-commits@winehq.org

5 participants
746 discussions

Huw Davies : comctl32: Limit the size of the header bitmap to 49x49.
by Alexandre Julliard 01 Aug '06

01 Aug '06

Module: wine Branch: refs/heads/master Commit: 608ddd4742417ebd20824771f47e1bc96289f204 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=608ddd4742417ebd2082477… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 31 15:38:14 2006 +0100 comctl32: Limit the size of the header bitmap to 49x49. --- dlls/comctl32/propsheet.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 31590ee..8fead28 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3269,15 +3269,16 @@ static LRESULT PROPSHEET_Paint(HWND hwnd } else { + int margin; hbr = GetSysColorBrush(COLOR_WINDOW); FillRect(hdc, &rzone, hbr); /* Draw the header bitmap. It's always centered like a * common 49 x 49 bitmap. */ - BitBlt(hdc, rzone.right - 49 - ((rzone.bottom - 49) / 2), - (rzone.bottom - 49) / 2, - bm.bmWidth, bm.bmHeight, - hdcSrc, 0, 0, SRCCOPY); + margin = (rzone.bottom - 49) / 2; + BitBlt(hdc, rzone.right - 49 - margin, margin, + min(bm.bmWidth, 49), min(bm.bmHeight, 49), + hdcSrc, 0, 0, SRCCOPY); /* NOTE: Native COMCTL32 draws a white stripe over the bitmap * if its height is smaller than 49 pixels. Because the reason

1 0

Huw Davies : comctl32: Invalidate the header area so that updated titles will be drawn.
by Alexandre Julliard 01 Aug '06

01 Aug '06

Module: wine Branch: refs/heads/master Commit: d1be762464ae55b602f7de540bba0041cc15f7cb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d1be762464ae55b602f7de5… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 31 15:28:17 2006 +0100 comctl32: Invalidate the header area so that updated titles will be drawn. --- dlls/comctl32/propsheet.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 01f2d0a..31590ee 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2079,6 +2079,21 @@ static BOOL PROPSHEET_SetCurSel(HWND hwn continue; } } + + /* Invalidate the header area */ + if ( (psInfo->ppshheader.dwFlags & (PSH_WIZARD97_OLD | PSH_WIZARD97_NEW)) && + (psInfo->ppshheader.dwFlags & PSH_HEADER) ) + { + HWND hwndLineHeader = GetDlgItem(hwndDlg, IDC_SUNKEN_LINEHEADER); + RECT r; + + GetClientRect(hwndLineHeader, &r); + MapWindowPoints(hwndLineHeader, hwndDlg, (LPPOINT) &r, 2); + SetRect(&r, 0, 0, r.right + 1, r.top - 1); + + InvalidateRect(hwndDlg, &r, TRUE); + } + /* * Display the new page. */

1 0

Huw Davies : comctl32: Wordwrap the sub title.
by Alexandre Julliard 01 Aug '06

01 Aug '06

Module: wine Branch: refs/heads/master Commit: 12c0da681577808b9afe2f7a15027a0aa1f31418 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=12c0da681577808b9afe2f7… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 31 13:58:43 2006 +0100 comctl32: Wordwrap the sub title. --- dlls/comctl32/propsheet.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index f6796c6..01f2d0a 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3283,8 +3283,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd szBuffer, 256); if (nLength != 0) { - DrawTextW(hdc, szBuffer, nLength, - &r, DT_LEFT | DT_SINGLELINE | DT_NOCLIP); + DrawTextW(hdc, szBuffer, nLength, &r, DT_LEFT | DT_SINGLELINE | DT_NOCLIP); } } } @@ -3293,15 +3292,14 @@ static LRESULT PROPSHEET_Paint(HWND hwnd SelectObject(hdc, psInfo->hFont); SetRect(&r, 40, 25, rzone.right - 69, rzone.bottom); if (HIWORD(ppshpage->pszHeaderTitle)) - DrawTextW(hdc, ppshpage->pszHeaderSubTitle, -1, &r, DT_LEFT | DT_SINGLELINE); + DrawTextW(hdc, ppshpage->pszHeaderSubTitle, -1, &r, DT_LEFT | DT_WORDBREAK); else { nLength = LoadStringW(ppshpage->hInstance, (UINT_PTR)ppshpage->pszHeaderSubTitle, szBuffer, 256); if (nLength != 0) { - DrawTextW(hdc, szBuffer, nLength, - &r, DT_LEFT | DT_SINGLELINE); + DrawTextW(hdc, szBuffer, nLength, &r, DT_LEFT | DT_WORDBREAK); } } }

1 0

Huw Davies : comctl32: The titles are already converted to unicode so always use DrawTextW to write them .
by Alexandre Julliard 01 Aug '06

01 Aug '06

Module: wine Branch: refs/heads/master Commit: 64ddc97b09b62547571422bddb37688355e6611c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=64ddc97b09b62547571422b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 31 12:47:45 2006 +0100 comctl32: The titles are already converted to unicode so always use DrawTextW to write them. --- dlls/comctl32/propsheet.c | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 907e638..f6796c6 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3276,14 +3276,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd if (ppshpage->dwFlags & PSP_USEHEADERTITLE) { SetRect(&r, 20, 10, 0, 0); if (HIWORD(ppshpage->pszHeaderTitle)) - { - if (psInfo->unicode) - DrawTextW(hdc, (LPWSTR)ppshpage->pszHeaderTitle, - -1, &r, DT_LEFT | DT_SINGLELINE | DT_NOCLIP); - else - DrawTextA(hdc, (LPCSTR)ppshpage->pszHeaderTitle, - -1, &r, DT_LEFT | DT_SINGLELINE | DT_NOCLIP); - } + DrawTextW(hdc, ppshpage->pszHeaderTitle, -1, &r, DT_LEFT | DT_SINGLELINE | DT_NOCLIP); else { nLength = LoadStringW(ppshpage->hInstance, (UINT_PTR)ppshpage->pszHeaderTitle, @@ -3300,14 +3293,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd SelectObject(hdc, psInfo->hFont); SetRect(&r, 40, 25, rzone.right - 69, rzone.bottom); if (HIWORD(ppshpage->pszHeaderTitle)) - { - if (psInfo->unicode) - DrawTextW(hdc, (LPWSTR)ppshpage->pszHeaderSubTitle, - -1, &r, DT_LEFT | DT_SINGLELINE); - else - DrawTextA(hdc, (LPCSTR)ppshpage->pszHeaderSubTitle, - -1, &r, DT_LEFT | DT_SINGLELINE); - } + DrawTextW(hdc, ppshpage->pszHeaderSubTitle, -1, &r, DT_LEFT | DT_SINGLELINE); else { nLength = LoadStringW(ppshpage->hInstance, (UINT_PTR)ppshpage->pszHeaderSubTitle,

1 0

Mikołaj Zalewski : shell32: Send directories and non-regular files to the trash.
by Alexandre Julliard 01 Aug '06

01 Aug '06

Module: wine Branch: refs/heads/master Commit: 718a9d6df50aafca22418bd36d39c45370483820 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=718a9d6df50aafca22418bd… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Aug 1 17:20:03 2006 +0200 shell32: Send directories and non-regular files to the trash. --- dlls/shell32/trash.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 595ab08..2e96bfb 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -132,7 +132,7 @@ static BOOL file_good_for_bucket(TRASH_B { if (pBucket->device != file_stat->st_dev) return FALSE; - return S_ISREG(file_stat->st_mode); + return TRUE; } BOOL TRASH_CanTrashFile(LPCWSTR wszPath)

1 0

Dmitry Timoshkov : user: Add a couple of missing bits to the SetWindowLong test.
by Alexandre Julliard 01 Aug '06

01 Aug '06

Module: wine Branch: refs/heads/master Commit: 0049e563cc01b378b8b4f79ee173bcfe106a19dd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0049e563cc01b378b8b4f79… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Aug 1 23:05:42 2006 +0900 user: Add a couple of missing bits to the SetWindowLong test. --- dlls/user/tests/win.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c index 35cd7fc..a1c7539 100644 --- a/dlls/user/tests/win.c +++ b/dlls/user/tests/win.c @@ -3831,6 +3831,7 @@ static int check_error(DWORD actual, DWO static void test_SetWindowLong(void) { LONG_PTR retval; + WNDPROC old_window_procW; SetLastError(0xdeadbeef); retval = SetWindowLongPtr(NULL, GWLP_WNDPROC, 0); @@ -3854,11 +3855,15 @@ static void test_SetWindowLong(void) "SetWindowLongPtr on invalid window proc shouldn't have changed the value returned by GetWindowLongPtr, instead of changing it to 0x%x\n", retval); ok(!IsWindowUnicode(hwndMain), "hwndMain shouldn't be Unicode\n"); + old_window_procW = (WNDPROC)GetWindowLongPtrW(hwndMain, GWLP_WNDPROC); SetLastError(0xdeadbeef); retval = SetWindowLongPtrW(hwndMain, GWLP_WNDPROC, 0); if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) { ok(GetLastError() == 0xdeadbeef, "SetWindowLongPtr shouldn't have set the last error, instead of setting it to %ld\n", GetLastError()); + ok(retval != 0, "SetWindowLongPtr error %ld\n", GetLastError()); + ok((WNDPROC)retval == old_window_procW, + "SetWindowLongPtr on invalid window proc shouldn't have changed the value returned by GetWindowLongPtr, instead of changing it to 0x%x\n", retval); ok(IsWindowUnicode(hwndMain), "hwndMain should now be Unicode\n"); /* set it back to ANSI */

1 0

Jacek Caban : mshtml: Added implementation of put_scrollTop and put_scrollLeft.
by Alexandre Julliard 01 Aug '06

01 Aug '06

Module: wine Branch: refs/heads/master Commit: 166f1999caee70c62fe27435537ec21242404c39 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=166f1999caee70c62fe2743… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 1 14:50:52 2006 +0200 mshtml: Added implementation of put_scrollTop and put_scrollLeft. --- dlls/mshtml/htmltextcont.c | 34 ++++++++++++++++++++++++++++++---- dlls/mshtml/nsiface.idl | 24 ++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltextcont.c b/dlls/mshtml/htmltextcont.c index 7f5816a..2634ac8 100644 --- a/dlls/mshtml/htmltextcont.c +++ b/dlls/mshtml/htmltextcont.c @@ -115,8 +115,21 @@ static HRESULT WINAPI HTMLTextContainer_ static HRESULT WINAPI HTMLTextContainer_put_scrollTop(IHTMLTextContainer *iface, long v) { HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); - FIXME("(%p)->(%ld)\n", This, v); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + nsresult nsres; + + TRACE("(%p)->(%ld)\n", This, v); + + nsres = nsIDOMHTMLElement_QueryInterface(This->element->nselem, &IID_nsIDOMNSHTMLElement, + (void**)&nselem); + if(NS_SUCCEEDED(nsres)) { + nsIDOMNSHTMLElement_SetScrollTop(nselem, v); + nsIDOMNSHTMLElement_Release(nselem); + }else { + ERR("Could not get nsIDOMNSHTMLElement interface: %08lx\n", nsres); + } + + return S_OK; } static HRESULT WINAPI HTMLTextContainer_get_scrollTop(IHTMLTextContainer *iface, long *p) @@ -129,8 +142,21 @@ static HRESULT WINAPI HTMLTextContainer_ static HRESULT WINAPI HTMLTextContainer_put_scrollLeft(IHTMLTextContainer *iface, long v) { HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); - FIXME("(%p)->(%ld)\n", This, v); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + nsresult nsres; + + TRACE("(%p)->(%ld)\n", This, v); + + nsres = nsIDOMHTMLElement_QueryInterface(This->element->nselem, &IID_nsIDOMNSHTMLElement, + (void**)&nselem); + if(NS_SUCCEEDED(nsres)) { + nsIDOMNSHTMLElement_SetScrollLeft(nselem, v); + nsIDOMNSHTMLElement_Release(nselem); + }else { + ERR("Could not get nsIDOMNSHTMLElement interface: %08lx\n", nsres); + } + + return S_OK; } static HRESULT WINAPI HTMLTextContainer_get_scrollLeft(IHTMLTextContainer *iface, long *p) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 72735a7..c1d5bb4 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -465,6 +465,30 @@ interface nsIDOMHTMLElement : nsIDOMElem [ object, + uuid(da83b2ec-8264-4410-8496-ada3acd2ae42) +] +interface nsIDOMNSHTMLElement : nsISupports +{ + nsresult GetOffsetTop(PRInt32 *aOffsetTop); + nsresult GetOffsetLeft(PRInt32 *aOffsetLeft); + nsresult GetOffsetWidth(PRInt32 *aOffsetWidth); + nsresult GetOffsetHeight(PRInt32 *aOffsetHeight); + nsresult GetOffsetParent(nsIDOMElement **aOffsetParent); + nsresult GetInnerHTML(nsAString *aInnerHTML); + nsresult SetInnerHTML(const nsAString *aInnerHTML); + nsresult GetScrollTop(PRInt32 *aScrollTop); + nsresult SetScrollTop(PRInt32 aScrollTop); + nsresult GetScrollLeft(PRInt32 *aScrollLeft); + nsresult SetScrollLeft(PRInt32 aScrollLeft); + nsresult GetScrollHeight(PRInt32 *aScrollHeight); + nsresult GetScrollWidth(PRInt32 *aScrollWidth); + nsresult GetClientHeight(PRInt32 *aClientHeight); + nsresult GetClientWidth(PRInt32 *aClientWidth); + nsresult ScrollIntoView(PRBool top); +} + +[ + object, uuid(a6cf9075-15b3-11d2-932e-00805f8add32) ] interface nsIDOMDocument : nsIDOMNode

1 0

Jacek Caban : mshtml: Store HTMLElement pointer in HTMLTextContainer.
by Alexandre Julliard 01 Aug '06

01 Aug '06

Module: wine Branch: refs/heads/master Commit: 82676b999d85fd2c90f12820897879aa54bf6038 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=82676b999d85fd2c90f1282… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 1 14:49:57 2006 +0200 mshtml: Store HTMLElement pointer in HTMLTextContainer. --- dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmltextcont.c | 10 +++++----- dlls/mshtml/mshtml_private.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index b557906..ceff7ed 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -441,7 +441,7 @@ void HTMLBodyElement_Create(HTMLElement ret->lpHTMLBodyElementVtbl = &HTMLBodyElementVtbl; ret->element = element; - HTMLTextContainer_Init(&ret->text_container, (IUnknown*)HTMLBODY(ret)); + HTMLTextContainer_Init(&ret->text_container, element); nsres = nsIDOMHTMLElement_QueryInterface(element->nselem, &IID_nsIDOMHTMLBodyElement, (void**)&ret->nsbody); diff --git a/dlls/mshtml/htmltextcont.c b/dlls/mshtml/htmltextcont.c index e104632..7f5816a 100644 --- a/dlls/mshtml/htmltextcont.c +++ b/dlls/mshtml/htmltextcont.c @@ -40,19 +40,19 @@ static HRESULT WINAPI HTMLTextContainer_ REFIID riid, void **ppv) { HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); - return IUnknown_QueryInterface(This->impl, riid, ppv); + return IHTMLElement_QueryInterface(HTMLELEM(This->element), riid, ppv); } static ULONG WINAPI HTMLTextContainer_AddRef(IHTMLTextContainer *iface) { HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); - return IUnknown_AddRef(This->impl); + return IHTMLElement_AddRef(HTMLELEM(This->element)); } static ULONG WINAPI HTMLTextContainer_Release(IHTMLTextContainer *iface) { HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); - return IUnknown_Release(This->impl); + return IHTMLElement_Release(HTMLELEM(This->element)); } static HRESULT WINAPI HTMLTextContainer_GetTypeInfoCount(IHTMLTextContainer *iface, UINT *pctinfo) @@ -175,8 +175,8 @@ static const IHTMLTextContainerVtbl HTML HTMLTextContainer_get_onscroll }; -void HTMLTextContainer_Init(HTMLTextContainer *This, IUnknown *impl) +void HTMLTextContainer_Init(HTMLTextContainer *This, HTMLElement *elem) { This->lpHTMLTextContainerVtbl = &HTMLTextContainerVtbl; - This->impl = impl; + This->element = elem; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2542836..e0c1c3c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -204,7 +204,7 @@ typedef struct { typedef struct { const IHTMLTextContainerVtbl *lpHTMLTextContainerVtbl; - IUnknown *impl; + HTMLElement *element; } HTMLTextContainer; #define HTMLDOC(x) ((IHTMLDocument2*) &(x)->lpHTMLDocument2Vtbl) @@ -316,7 +316,7 @@ void HTMLTextAreaElement_Create(HTMLElem void HTMLElement2_Init(HTMLElement*); -void HTMLTextContainer_Init(HTMLTextContainer*,IUnknown*); +void HTMLTextContainer_Init(HTMLTextContainer*,HTMLElement*); HRESULT HTMLDOMNode_QI(HTMLDOMNode*,REFIID,void**); HRESULT HTMLElement_QI(HTMLElement*,REFIID,void**);

1 0

Robert Reif : advapi32: More LsaQueryInformationPolicy tests.
by Alexandre Julliard 01 Aug '06

01 Aug '06

Module: wine Branch: refs/heads/master Commit: c6e513dc720204a6526a5710d4137ec1705bb770 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c6e513dc720204a6526a571… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Aug 1 07:35:54 2006 -0400 advapi32: More LsaQueryInformationPolicy tests. --- dlls/advapi32/tests/lsa.c | 34 ++++++++++++++++++++++++++++------ 1 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index cb894ad..47144b0 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -66,12 +66,34 @@ static void test_lsa(void) ok(status == STATUS_SUCCESS, "LsaOpenPolicy() returned 0x%08lx\n", status); if (status == STATUS_SUCCESS) { - PPOLICY_PRIMARY_DOMAIN_INFO domain_info; - - status = pLsaQueryInformationPolicy(handle, PolicyPrimaryDomainInformation, (PVOID*)&domain_info); - ok(status == STATUS_SUCCESS, "LsaQueryInformationPolicy() failed, returned 0x%08lx\n", status); - if (status == STATUS_SUCCESS) - pLsaFreeMemory((LPVOID)domain_info); + PPOLICY_AUDIT_EVENTS_INFO audit_events_info; + PPOLICY_PRIMARY_DOMAIN_INFO primary_domain_info; + PPOLICY_ACCOUNT_DOMAIN_INFO account_domain_info; + PPOLICY_DNS_DOMAIN_INFO dns_domain_info; + + status = pLsaQueryInformationPolicy(handle, PolicyAuditEventsInformation, (PVOID*)&audit_events_info); + ok(status == STATUS_SUCCESS, "LsaQueryInformationPolicy(PolicyAuditEventsInformation) failed, returned 0x%08lx\n", status); + if (status == STATUS_SUCCESS) { + pLsaFreeMemory((LPVOID)audit_events_info); + } + + status = pLsaQueryInformationPolicy(handle, PolicyPrimaryDomainInformation, (PVOID*)&primary_domain_info); + ok(status == STATUS_SUCCESS, "LsaQueryInformationPolicy(PolicyPrimaryDomainInformation) failed, returned 0x%08lx\n", status); + if (status == STATUS_SUCCESS) { + pLsaFreeMemory((LPVOID)primary_domain_info); + } + + status = pLsaQueryInformationPolicy(handle, PolicyAccountDomainInformation, (PVOID*)&account_domain_info); + ok(status == STATUS_SUCCESS, "LsaQueryInformationPolicy(PolicyAccountDomainInformation) failed, returned 0x%08lx\n", status); + if (status == STATUS_SUCCESS) { + pLsaFreeMemory((LPVOID)account_domain_info); + } + + status = pLsaQueryInformationPolicy(handle, PolicyDnsDomainInformation, (PVOID*)&dns_domain_info); + ok(status == STATUS_SUCCESS, "LsaQueryInformationPolicy(PolicyDnsDomainInformation) failed, returned 0x%08lx\n", status); + if (status == STATUS_SUCCESS) { + pLsaFreeMemory((LPVOID)dns_domain_info); + } status = pLsaClose(handle); ok(status == STATUS_SUCCESS, "LsaClose() failed, returned 0x%08lx\n", status);

1 0

Mike McCormack : hlink: Use ShellExecute to start the link if we can' t get a IHlinkTarget.
by Alexandre Julliard 01 Aug '06

01 Aug '06

Module: wine Branch: refs/heads/master Commit: 9198d016f2a44fd7bfdd1b9ef7375cd4990d021c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9198d016f2a44fd7bfdd1b9… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Aug 2 03:25:36 2006 +0900 hlink: Use ShellExecute to start the link if we can't get a IHlinkTarget. --- dlls/hlink/Makefile.in | 2 +- dlls/hlink/link.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/Makefile.in b/dlls/hlink/Makefile.in index 11423b0..b6cbb78 100644 --- a/dlls/hlink/Makefile.in +++ b/dlls/hlink/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = hlink.dll -IMPORTS = ole32 advapi32 kernel32 +IMPORTS = shell32 ole32 advapi32 kernel32 IMPORTLIB = libhlink.$(IMPLIBEXT) DELAYIMPORTS = urlmon EXTRALIBS = -luuid diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 814785a..cce6955 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -29,6 +29,7 @@ #include "winuser.h" #include "ole2.h" #include "unknwn.h" #include "objidl.h" +#include "shellapi.h" #include "wine/debug.h" #include "hlink.h" @@ -428,6 +429,18 @@ static HRESULT WINAPI IHlink_fnNavigate( IHlinkTarget_Navigate(target, grfHLNF, This->Location); IHlinkTarget_Release(target); } + else + { + static const WCHAR szOpen[] = {'o','p','e','n',0}; + LPWSTR target = NULL; + + r = IHlink_GetStringReference(iface, HLINKGETREF_DEFAULT, &target, NULL); + if (SUCCEEDED(r) && target) + { + ShellExecuteW(NULL, szOpen, target, NULL, NULL, SW_SHOW); + CoTaskMemFree(target); + } + } RevokeBindStatusCallback(bcxt, pbsc);

1 0

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 August 2006