December 2009 - Wine-commits

Huw Davies : shdocvw: Fix a memory leak in the tests.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 53ee807a3b906d9035c4e2e87e98f01e7719b4b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53ee807a3b906d9035c4e2e87… Author: Huw Davies <huw(a)codeweavers.com> Date: Sat Dec 12 12:19:05 2009 +0000 shdocvw: Fix a memory leak in the tests. Found by Valgrind. --- dlls/shdocvw/tests/shortcut.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/tests/shortcut.c b/dlls/shdocvw/tests/shortcut.c index 5a740dc..f38ae2b 100644 --- a/dlls/shdocvw/tests/shortcut.c +++ b/dlls/shdocvw/tests/shortcut.c @@ -216,9 +216,10 @@ static void test_ShortcutFolder(void) { ok (pidlCurFolder->mkid.cb == 20 && ((LPSHITEMID)((BYTE*)pidlCurFolder+20))->cb == 0 && IsEqualCLSID(&CLSID_WineTest, (REFCLSID)((LPBYTE)pidlCurFolder+4)), "GetCurFolder returned unexpected pidl!\n"); - + + ILFree(pidlCurFolder); IPersistFolder3_Release(pWineTestPersistFolder); - + cleanup: unregister_keys(HKEY_CLASSES_ROOT, HKEY_CLASSES_ROOT_keys, 1); }

1 0

Huw Davies : oleaut32: Fix a memory leak in the tests.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 663e11b256de90fd9521841a62a34c78844691a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=663e11b256de90fd9521841a6… Author: Huw Davies <huw(a)codeweavers.com> Date: Sat Dec 12 14:04:35 2009 +0000 oleaut32: Fix a memory leak in the tests. Found by Valgrind. --- dlls/oleaut32/tests/dispatch.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/dispatch.c b/dlls/oleaut32/tests/dispatch.c index c81210f..09c4d69 100644 --- a/dlls/oleaut32/tests/dispatch.c +++ b/dlls/oleaut32/tests/dispatch.c @@ -264,6 +264,7 @@ void test_DispGetParam(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(V_VT(&result) == VT_BSTR, "Expected VT_BSTR, got %08x\n", V_VT(&result)); ok(err_index == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", err_index); + VariantClear(&result); } START_TEST(dispatch)

1 0

Huw Davies : browseui: Fix several memory leaks in the tests.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: f75981c712ffb38dc08eeb8c25fac78cff988458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f75981c712ffb38dc08eeb8c2… Author: Huw Davies <huw(a)codeweavers.com> Date: Sat Dec 12 14:21:17 2009 +0000 browseui: Fix several memory leaks in the tests. Found by Valgrind. --- dlls/browseui/tests/autocomplete.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/tests/autocomplete.c b/dlls/browseui/tests/autocomplete.c index 85a7da5..84be84d 100644 --- a/dlls/browseui/tests/autocomplete.c +++ b/dlls/browseui/tests/autocomplete.c @@ -219,6 +219,7 @@ IACListVtbl TestACL_ACListVtbl = ole_ok(obj->lpVtbl->Next(obj, 1, &wstr, &i)); \ ok(i == 1, "Expected i == 1, got %d\n", i); \ ok(str[0] == wstr[0], "String mismatch\n"); \ + CoTaskMemFree(wstr); \ } #define expect_end(obj) \ @@ -280,9 +281,13 @@ static void test_ACLMulti(void) ole_ok(obj->lpVtbl->Next(obj, 15, wstrtab, &i)); ok(i == 1, "Expected i == 1, got %d\n", i); + CoTaskMemFree(wstrtab[0]); ole_ok(obj->lpVtbl->Next(obj, 15, wstrtab, &i)); + CoTaskMemFree(wstrtab[0]); ole_ok(obj->lpVtbl->Next(obj, 15, wstrtab, &i)); + CoTaskMemFree(wstrtab[0]); ole_ok(obj->lpVtbl->Next(obj, 15, wstrtab, &i)); + CoTaskMemFree(wstrtab[0]); ole_ok(acl->lpVtbl->Expand(acl, exp)); ok(acl1->expcount == 2, "expcount - expected 1, got %d\n", acl1->expcount); ok(acl2->expcount == 0 /* XP */ || acl2->expcount == 2 /* Vista */,

1 0

Huw Davies : gdiplus: Fix a memory leak.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 68bacfb8d52b54ee6048b459e9ed3e2265cae313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68bacfb8d52b54ee6048b459e… Author: Huw Davies <huw(a)codeweavers.com> Date: Sat Dec 12 16:49:15 2009 +0000 gdiplus: Fix a memory leak. Found by Valgrind. --- dlls/gdiplus/graphics.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 80ef463..b1092b7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4161,6 +4161,7 @@ GpStatus WINGDIPAPI GdipGetClip(GpGraphics *graphics, GpRegion *region) /* free everything except root node and header */ delete_element(&region->node); memcpy(region, clip, sizeof(GpRegion)); + GdipFree(clip); return Ok; }

1 0

Alexandre Julliard : user32: Split the handling of the 16-bit messages out of the static winproc.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: fb2022647562d96de4f57bf1174f4610c2643711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb2022647562d96de4f57bf11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 20:25:32 2009 +0100 user32: Split the handling of the 16-bit messages out of the static winproc. --- dlls/user32/static.c | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 6c61db2..80c502d 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -572,9 +572,6 @@ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, case STM_GETIMAGE: return (LRESULT)STATIC_GetImage( hwnd, wParam, full_style ); - case STM_GETICON16: - return HICON_16(STATIC_GetImage( hwnd, IMAGE_ICON, full_style )); - case STM_GETICON: return (LRESULT)STATIC_GetImage( hwnd, IMAGE_ICON, full_style ); @@ -597,9 +594,6 @@ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, STATIC_TryPaintFcn( hwnd, full_style ); break; - case STM_SETICON16: - wParam = (WPARAM)HICON_32( (HICON16)wParam ); - /* fall through */ case STM_SETICON: lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)wParam, full_style ); STATIC_TryPaintFcn( hwnd, full_style ); @@ -613,12 +607,29 @@ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, } /*********************************************************************** + * StaticWndProc_wrapper16 + */ +static LRESULT StaticWndProc_wrapper16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) +{ + switch (msg) + { + case STM_SETICON16: + wParam = (WPARAM)HICON_32( (HICON16)wParam ); + return StaticWndProc_common( hwnd, STM_SETICON, wParam, lParam, FALSE ); + case STM_GETICON16: + return HICON_16( StaticWndProc_common( hwnd, STM_GETICON, wParam, lParam, FALSE )); + default: + return StaticWndProc_common( hwnd, msg, wParam, lParam, unicode ); + } +} + +/*********************************************************************** * StaticWndProcA */ static LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { if (!IsWindow( hWnd )) return 0; - return StaticWndProc_common(hWnd, uMsg, wParam, lParam, FALSE); + return StaticWndProc_wrapper16(hWnd, uMsg, wParam, lParam, FALSE); } /*********************************************************************** @@ -627,7 +638,7 @@ static LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARA static LRESULT WINAPI StaticWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { if (!IsWindow( hWnd )) return 0; - return StaticWndProc_common(hWnd, uMsg, wParam, lParam, TRUE); + return StaticWndProc_wrapper16(hWnd, uMsg, wParam, lParam, TRUE); } static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style )

1 0

Alexandre Julliard : user32: Move SystemParametersInfo16 to user16.c.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 57e9244ab6695e7042da597f8895bbb6cef7f09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=57e9244ab6695e7042da597f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 20:59:04 2009 +0100 user32: Move SystemParametersInfo16 to user16.c. --- dlls/user32/sysparams.c | 146 +---------------------------------------------- dlls/user32/user16.c | 130 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57e9244ab6695e7042da5…

1 0

Alexandre Julliard : user32: Remove the no longer used WINPROC_CallDlgProc16 function.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 2f0bfbac36b36e5b0221b51c4b54ba235e8e3d23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0bfbac36b36e5b0221b51c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 13 10:59:31 2009 +0100 user32: Remove the no longer used WINPROC_CallDlgProc16 function. --- dlls/user32/user_private.h | 1 - dlls/user32/winproc.c | 43 ------------------------------------------- 2 files changed, 0 insertions(+), 44 deletions(-) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 67fdbb6..e5db691 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -250,7 +250,6 @@ extern LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd extern LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg ) DECLSPEC_HIDDEN; -extern INT_PTR WINPROC_CallDlgProc16( DLGPROC16 func, HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 91eeeb7..d08a59f 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -593,14 +593,6 @@ static LRESULT call_window_proc_AtoW( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, arg, WMCHAR_MAP_CALLWINDOWPROC ); } -/* helper callback for 16->32W conversion */ -static LRESULT call_dialog_proc_AtoW( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, - LRESULT *result, void *arg ) -{ - return WINPROC_CallProcAtoW( call_dialog_proc, hwnd, msg, wp, lp, result, - arg, WMCHAR_MAP_CALLWINDOWPROC ); -} - /********************************************************************** * WINPROC_GetProc16 @@ -2330,41 +2322,6 @@ LRESULT WINAPI CallWindowProcW( WNDPROC func, HWND hwnd, UINT msg, /********************************************************************** - * WINPROC_CallDlgProc16 - */ -INT_PTR WINPROC_CallDlgProc16( DLGPROC16 func, HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam ) -{ - WINDOWPROC *proc; - LRESULT result; - INT_PTR ret; - - if (!func) return 0; - - if (!(proc = handle16_to_proc( (WNDPROC16)func ))) - { - ret = call_dialog_proc16( hwnd, msg, wParam, lParam, &result, func ); - } - else if (proc->procA) - { - ret = WINPROC_CallProc16To32A( call_dialog_proc, hwnd, msg, wParam, lParam, - &result, proc->procA ); - SetWindowLongPtrW( WIN_Handle32(hwnd), DWLP_MSGRESULT, result ); - } - else if (proc->procW) - { - ret = WINPROC_CallProc16To32A( call_dialog_proc_AtoW, hwnd, msg, wParam, lParam, - &result, proc->procW ); - SetWindowLongPtrW( WIN_Handle32(hwnd), DWLP_MSGRESULT, result ); - } - else - { - ret = call_dialog_proc16( hwnd, msg, wParam, lParam, &result, proc->proc16 ); - } - return ret; -} - - -/********************************************************************** * WINPROC_CallDlgProcA */ INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam )

1 0

Alexandre Julliard : user32: Move Get/ SetWindowLong16 implementation to wnd16.c.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 9727750c796538eb88726ad77d61381428de02e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9727750c796538eb88726ad77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 13 15:30:35 2009 +0100 user32: Move Get/SetWindowLong16 implementation to wnd16.c. --- dlls/user32/win.c | 82 --------------------------------------------------- dlls/user32/wnd16.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 82 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 46c2388..bb19a4e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2307,55 +2307,6 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B /********************************************************************** - * GetWindowLong (USER.135) - */ -LONG WINAPI GetWindowLong16( HWND16 hwnd, INT16 offset ) -{ - WND *wndPtr; - LONG_PTR retvalue; - BOOL is_winproc = (offset == GWLP_WNDPROC); - - if (offset >= 0) - { - if (!(wndPtr = WIN_GetPtr( WIN_Handle32(hwnd) ))) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return 0; - } - if (wndPtr != WND_OTHER_PROCESS && wndPtr != WND_DESKTOP) - { - if (offset > (int)(wndPtr->cbWndExtra - sizeof(LONG))) - { - /* - * Some programs try to access last element from 16 bit - * code using illegal offset value. Hopefully this is - * what those programs really expect. - */ - if (wndPtr->cbWndExtra >= 4 && offset == wndPtr->cbWndExtra - sizeof(WORD)) - { - INT offset2 = wndPtr->cbWndExtra - sizeof(LONG); - ERR( "- replaced invalid offset %d with %d\n", offset, offset2 ); - offset = offset2; - } - else - { - WARN("Invalid offset %d\n", offset ); - WIN_ReleasePtr( wndPtr ); - SetLastError( ERROR_INVALID_INDEX ); - return 0; - } - } - is_winproc = ((offset == DWLP_DLGPROC) && (wndPtr->flags & WIN_ISDIALOG)); - WIN_ReleasePtr( wndPtr ); - } - } - retvalue = GetWindowLongA( WIN_Handle32(hwnd), offset ); - if (is_winproc) retvalue = (LONG_PTR)WINPROC_GetProc16( (WNDPROC)retvalue, FALSE ); - return retvalue; -} - - -/********************************************************************** * GetWindowWord (USER32.@) */ WORD WINAPI GetWindowWord( HWND hwnd, INT offset ) @@ -2398,39 +2349,6 @@ LONG WINAPI GetWindowLongW( HWND hwnd, INT offset ) /********************************************************************** - * SetWindowLong (USER.136) - */ -LONG WINAPI SetWindowLong16( HWND16 hwnd, INT16 offset, LONG newval ) -{ - WND *wndPtr; - BOOL is_winproc = (offset == GWLP_WNDPROC); - - if (offset == DWLP_DLGPROC) - { - if (!(wndPtr = WIN_GetPtr( WIN_Handle32(hwnd) ))) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return 0; - } - if (wndPtr != WND_OTHER_PROCESS && wndPtr != WND_DESKTOP) - { - is_winproc = ((wndPtr->cbWndExtra - sizeof(LONG_PTR) >= DWLP_DLGPROC) && - (wndPtr->flags & WIN_ISDIALOG)); - WIN_ReleasePtr( wndPtr ); - } - } - - if (is_winproc) - { - WNDPROC new_proc = WINPROC_AllocProc16( (WNDPROC16)newval ); - WNDPROC old_proc = (WNDPROC)SetWindowLongPtrA( WIN_Handle32(hwnd), offset, (LONG_PTR)new_proc ); - return (LONG)WINPROC_GetProc16( old_proc, FALSE ); - } - else return SetWindowLongA( WIN_Handle32(hwnd), offset, newval ); -} - - -/********************************************************************** * SetWindowWord (USER32.@) */ WORD WINAPI SetWindowWord( HWND hwnd, INT offset, WORD newval ) diff --git a/dlls/user32/wnd16.c b/dlls/user32/wnd16.c index 1f7b0b0..f3f7e67 100644 --- a/dlls/user32/wnd16.c +++ b/dlls/user32/wnd16.c @@ -719,6 +719,85 @@ WORD WINAPI SetWindowWord16( HWND16 hwnd, INT16 offset, WORD newval ) } +/********************************************************************** + * GetWindowLong (USER.135) + */ +LONG WINAPI GetWindowLong16( HWND16 hwnd, INT16 offset ) +{ + WND *wndPtr; + LONG_PTR retvalue; + BOOL is_winproc = (offset == GWLP_WNDPROC); + + if (offset >= 0) + { + if (!(wndPtr = WIN_GetPtr( WIN_Handle32(hwnd) ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } + if (wndPtr != WND_OTHER_PROCESS && wndPtr != WND_DESKTOP) + { + if (offset > (int)(wndPtr->cbWndExtra - sizeof(LONG))) + { + /* + * Some programs try to access last element from 16 bit + * code using illegal offset value. Hopefully this is + * what those programs really expect. + */ + if (wndPtr->cbWndExtra >= 4 && offset == wndPtr->cbWndExtra - sizeof(WORD)) + { + offset = wndPtr->cbWndExtra - sizeof(LONG); + } + else + { + WIN_ReleasePtr( wndPtr ); + SetLastError( ERROR_INVALID_INDEX ); + return 0; + } + } + is_winproc = ((offset == DWLP_DLGPROC) && (wndPtr->flags & WIN_ISDIALOG)); + WIN_ReleasePtr( wndPtr ); + } + } + retvalue = GetWindowLongA( WIN_Handle32(hwnd), offset ); + if (is_winproc) retvalue = (LONG_PTR)WINPROC_GetProc16( (WNDPROC)retvalue, FALSE ); + return retvalue; +} + + +/********************************************************************** + * SetWindowLong (USER.136) + */ +LONG WINAPI SetWindowLong16( HWND16 hwnd, INT16 offset, LONG newval ) +{ + WND *wndPtr; + BOOL is_winproc = (offset == GWLP_WNDPROC); + + if (offset == DWLP_DLGPROC) + { + if (!(wndPtr = WIN_GetPtr( WIN_Handle32(hwnd) ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } + if (wndPtr != WND_OTHER_PROCESS && wndPtr != WND_DESKTOP) + { + is_winproc = ((wndPtr->cbWndExtra - sizeof(LONG_PTR) >= DWLP_DLGPROC) && + (wndPtr->flags & WIN_ISDIALOG)); + WIN_ReleasePtr( wndPtr ); + } + } + + if (is_winproc) + { + WNDPROC new_proc = WINPROC_AllocProc16( (WNDPROC16)newval ); + WNDPROC old_proc = (WNDPROC)SetWindowLongPtrA( WIN_Handle32(hwnd), offset, (LONG_PTR)new_proc ); + return (LONG)WINPROC_GetProc16( old_proc, FALSE ); + } + else return SetWindowLongA( WIN_Handle32(hwnd), offset, newval ); +} + + /************************************************************************** * OpenClipboard (USER.137) */

1 0

Vincent Povirk : winex11.drv: Use the old method to delete the desktop window.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 6f9533feb112bd89c2b7dd983590682fc2dd4e69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f9533feb112bd89c2b7dd983… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 11 11:47:59 2009 -0600 winex11.drv: Use the old method to delete the desktop window. --- dlls/winex11.drv/event.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index e8e4522..32eb64a 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -507,6 +507,14 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) if (protocol == x11drv_atom(WM_DELETE_WINDOW)) { + if (hwnd == GetDesktopWindow()) + { + /* The desktop window does not have a close button that we can + * pretend to click. Therefore, we simply send it a close command. */ + SendMessageW(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0); + return; + } + /* Ignore the delete window request if the window has been disabled * and we are in managed mode. This is to disallow applications from * being closed by the window manager while in a modal state.

1 0

Aric Stewart : shlwapi: Beginning implementation of IUnknown_QueryServiceForWebBrowserApp.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 0cdd4722fa138e44a80228097d696e2c7b51a804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cdd4722fa138e44a80228097… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Dec 11 15:44:10 2009 -0600 shlwapi: Beginning implementation of IUnknown_QueryServiceForWebBrowserApp. --- dlls/shlwapi/ordinal.c | 24 ++++++++++++++++++++++++ dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index f127ca1..223e4a8 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4728,3 +4728,27 @@ INT WINAPI SHVerbExistsNA(LPSTR verb, PVOID pUnknown, PVOID pUnknown2, DWORD dwU FIXME("(%s, %p, %p, %i) STUB\n",verb, pUnknown, pUnknown2, dwUnknown3); return 0; } + +/************************************************************************* + * @ [SHLWAPI.538] + * + * Undocumented: Implementation guessed at via Name and behavior + * + * PARAMS + * lpUnknown [I] Object to get an IServiceProvider interface from + * riid [I] Function requested for QueryService call + * lppOut [O] Destination for the service interface pointer + * + * RETURNS + * Success: S_OK. lppOut contains an object providing the requested service + * Failure: An HRESULT error code + * + * NOTES + * lpUnknown is expected to support the IServiceProvider interface. + */ +HRESULT WINAPI IUnknown_QueryServiceForWebBrowserApp(IUnknown* lpUnknown, + REFGUID riid, LPVOID *lppOut) +{ + FIXME("%p %s %p semi-STUB\n", lpUnknown, debugstr_guid(riid), lppOut); + return IUnknown_QueryService(lpUnknown,&IID_IWebBrowserApp,riid,lppOut); +} diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index c877dd1..3a962eb 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -531,7 +531,7 @@ 535 stub -noname SHPropertyBag_Delete 536 stub -noname IUnknown_QueryServicePropertyBag 537 stub -noname SHBoolSystemParametersInfo -538 stub -noname IUnknown_QueryServiceForWebBrowserApp +538 stdcall -noname IUnknown_QueryServiceForWebBrowserApp(ptr ptr ptr) 539 stub -noname IUnknown_ShowBrowserBar 540 stub -noname SHInvokeCommandOnContextMenu 541 stub -noname SHInvokeCommandsOnContextMen

1 0