March 2009 - Wine-Commits - list.winehq.org

Tony Wasserka : d3dx9: Implement ID3DXSprite_Get/SetTransform.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: f975d4bfa79177f50374cab58cf60d580945cace URL: http://source.winehq.org/git/wine.git/?a=commit;h=f975d4bfa79177f50374cab58… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sat Feb 28 19:05:29 2009 +0100 d3dx9: Implement ID3DXSprite_Get/SetTransform. --- dlls/d3dx9_36/sprite.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index 0c2bb20..3924bba 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -91,15 +91,23 @@ static HRESULT WINAPI ID3DXSpriteImpl_GetDevice(LPD3DXSPRITE iface, LPDIRECT3DDE static HRESULT WINAPI ID3DXSpriteImpl_GetTransform(LPD3DXSPRITE iface, D3DXMATRIX *transform) { ID3DXSpriteImpl *This=(ID3DXSpriteImpl*)iface; - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + TRACE("(%p)\n", This); + + if(transform==NULL) return D3DERR_INVALIDCALL; + *transform=This->transform; + + return D3D_OK; } static HRESULT WINAPI ID3DXSpriteImpl_SetTransform(LPD3DXSPRITE iface, CONST D3DXMATRIX *transform) { ID3DXSpriteImpl *This=(ID3DXSpriteImpl*)iface; - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + TRACE("(%p)\n", This); + + if(transform==NULL) return D3DERR_INVALIDCALL; + This->transform=*transform; + + return D3D_OK; } static HRESULT WINAPI ID3DXSpriteImpl_SetWorldViewRH(LPD3DXSPRITE iface, CONST D3DXMATRIX *world, CONST D3DXMATRIX *view)

1 0

Eric Pouech : winex11: Correctly pad 1 bpp DDB's lines with 0 values.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 21c3e79e52c54857c7b3a41c96ac58328d70bc16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c3e79e52c54857c7b3a41c9… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Feb 28 14:07:52 2009 +0100 winex11: Correctly pad 1 bpp DDB's lines with 0 values. --- dlls/gdi32/tests/bitmap.c | 1 - dlls/winex11.drv/dib.c | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index db3ae6d..b1ba7a0 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1580,7 +1580,6 @@ static void test_GetDIBits(void) } /* returned bits are DWORD aligned and upside down */ -todo_wine ok(!memcmp(buf, dib_bits_1, sizeof(dib_bits_1)), "DIB bits don't match\n"); /* Test the palette indices */ diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 4af4336..6df4137 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -618,8 +618,11 @@ static void X11DRV_DIB_GetImageBits_1( int lines, BYTE *dstbits, } } if ((width&7)!=0) { - *dstbyte=dstval; + *dstbyte++=dstval; } + /* pad with 0 to DWORD alignment */ + for (x = (x+7)&~7; x < ((width + 31) & ~31); x+=8) + *dstbyte++ = 0; dstbits += linebytes; } } else {

1 0

Paul Vriens : user32/tests: Fix some test failures on Win98/WinME.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 66bd3d428fe128638fc7d50db75199d2a0af1544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66bd3d428fe128638fc7d50db… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Mar 2 13:20:30 2009 +0100 user32/tests: Fix some test failures on Win98/WinME. --- dlls/user32/tests/menu.c | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 324f810..a79c540 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2447,13 +2447,17 @@ static void test_menu_getmenuinfo(void) ret = pGetMenuInfo( hmenu, NULL); gle= GetLastError(); ok( !ret, "GetMenuInfo() should have failed\n"); - ok( gle == ERROR_INVALID_PARAMETER, "GetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); + ok( gle == ERROR_INVALID_PARAMETER || + broken(gle == 0xdeadbeef), /* Win98, WinME */ + "GetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); mi.cbSize = 0; ret = pGetMenuInfo( hmenu, &mi); gle= GetLastError(); ok( !ret, "GetMenuInfo() should have failed\n"); - ok( gle == ERROR_INVALID_PARAMETER, "GetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); + ok( gle == ERROR_INVALID_PARAMETER || + broken(gle == 0xdeadbeef), /* Win98, WinME */ + "GetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); mi.cbSize = sizeof( MENUINFO); ret = pGetMenuInfo( hmenu, &mi); @@ -2465,8 +2469,10 @@ static void test_menu_getmenuinfo(void) ret = pGetMenuInfo( NULL, &mi); gle= GetLastError(); ok( !ret, "GetMenuInfo() should have failed\n"); - ok( gle == ERROR_INVALID_PARAMETER, "GetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); - /* clean up */ + ok( gle == ERROR_INVALID_PARAMETER || + broken(gle == 0xdeadbeef), /* Win98, WinME */ + "GetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); + /* clean up */ DestroyMenu( hmenu); return; } @@ -2492,13 +2498,17 @@ static void test_menu_setmenuinfo(void) ret = pSetMenuInfo( hmenu, NULL); gle= GetLastError(); ok( !ret, "SetMenuInfo() should have failed\n"); - ok( gle == ERROR_INVALID_PARAMETER, "SetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); + ok( gle == ERROR_INVALID_PARAMETER || + broken(gle == 0xdeadbeef), /* Win98, WinME */ + "SetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); mi.cbSize = 0; ret = pSetMenuInfo( hmenu, &mi); gle= GetLastError(); ok( !ret, "SetMenuInfo() should have failed\n"); - ok( gle == ERROR_INVALID_PARAMETER, "SetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); + ok( gle == ERROR_INVALID_PARAMETER || + broken(gle == 0xdeadbeef), /* Win98, WinME */ + "SetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); mi.cbSize = sizeof( MENUINFO); ret = pSetMenuInfo( hmenu, &mi); @@ -2510,7 +2520,9 @@ static void test_menu_setmenuinfo(void) ret = pSetMenuInfo( NULL, &mi); gle= GetLastError(); ok( !ret, "SetMenuInfo() should have failed\n"); - ok( gle == ERROR_INVALID_PARAMETER, "SetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); + ok( gle == ERROR_INVALID_PARAMETER || + broken(gle == 0xdeadbeef), /* Win98, WinME */ + "SetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); /* functional tests */ /* menu and submenu should have the CHECKORBMP style bit cleared */ SetLastError(0xdeadbeef);

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/ put textDecorationBlink.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 2619dda6b7f813b4c15eb89a7344537a4030535e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2619dda6b7f813b4c15eb89a7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 1 20:06:29 2009 +1100 mshtml: Implement IHTMLStyle get/put textDecorationBlink. --- dlls/mshtml/htmlstyle.c | 14 ++++++++++---- dlls/mshtml/tests/dom.c | 16 ++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 14de764..a7eff56 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -160,6 +160,8 @@ static const WCHAR styleNone[] = {'n','o','n','e',0}; static const WCHAR valOverline[] = {'o','v','e','r','l','i','n','e',0}; +static const WCHAR valBlink[] = + {'b','l','i','n','k',0}; static const WCHAR px_formatW[] = {'%','d','p','x',0}; static const WCHAR emptyW[] = {0}; @@ -1010,15 +1012,19 @@ static HRESULT WINAPI HTMLStyle_get_textDecorationLineThrough(IHTMLStyle *iface, static HRESULT WINAPI HTMLStyle_put_textDecorationBlink(IHTMLStyle *iface, VARIANT_BOOL v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, v); + + return set_style_attr(This, STYLEID_TEXT_DECORATION, v ? valBlink : emptyW, 0); } static HRESULT WINAPI HTMLStyle_get_textDecorationBlink(IHTMLStyle *iface, VARIANT_BOOL *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return check_style_attr_value(This, STYLEID_TEXT_DECORATION, valBlink, p); } static HRESULT WINAPI HTMLStyle_put_verticalAlign(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index bf37cfc..c0fb009 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2782,6 +2782,22 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_put_textDecorationOverline(style, VARIANT_FALSE); ok(hres == S_OK, "put_textDecorationOverline failed: %08x\n", hres); + b = 0xfefe; + hres = IHTMLStyle_get_textDecorationBlink(style, &b); + ok(hres == S_OK, "get_textDecorationBlink failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "textDecorationBlink = %x\n", b); + + hres = IHTMLStyle_put_textDecorationBlink(style, VARIANT_TRUE); + ok(hres == S_OK, "put_textDecorationBlink failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "textDecorationBlink = %x\n", b); + + hres = IHTMLStyle_get_textDecorationBlink(style, &b); + ok(hres == S_OK, "get_textDecorationBlink failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "textDecorationBlink = %x\n", b); + + hres = IHTMLStyle_put_textDecorationBlink(style, VARIANT_FALSE); + ok(hres == S_OK, "textDecorationBlink failed: %08x\n", hres); + hres = IHTMLStyle_get_posWidth(style, NULL); ok(hres == E_POINTER, "get_posWidth failed: %08x\n", hres);

1 0

Detlef Riekenberg : spoolss: Implement AddPrinterDriverExW.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 5104db3d82c410cec725143ddb11c8aaa3051417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5104db3d82c410cec725143dd… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 1 00:23:26 2009 +0100 spoolss: Implement AddPrinterDriverExW. --- dlls/spoolss/router.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/spoolss/spoolss.spec | 2 +- 2 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index 6fc7b59..479d23a 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -355,6 +355,46 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors) } /****************************************************************** + * AddPrinterDriverExW (spoolss.@) + * + * Install a Printer Driver with the Option to upgrade / downgrade the Files + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * level [I] Level for the supplied DRIVER_INFO_*W struct + * pDriverInfo [I] PTR to DRIVER_INFO_*W struct with the Driver Parameter + * dwFileCopyFlags [I] How to Copy / Upgrade / Downgrade the needed Files + * + * RESULTS + * Success: TRUE + * Failure: FALSE + * + */ +BOOL WINAPI AddPrinterDriverExW(LPWSTR pName, DWORD level, LPBYTE pDriverInfo, DWORD dwFileCopyFlags) +{ + backend_t * pb; + DWORD res = ROUTER_UNKNOWN; + + TRACE("(%s, %d, %p, 0x%x)\n", debugstr_w(pName), level, pDriverInfo, dwFileCopyFlags); + + if (!pDriverInfo) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + pb = backend_first(pName); + if (pb && pb->fpAddPrinterDriverEx) + res = pb->fpAddPrinterDriverEx(pName, level, pDriverInfo, dwFileCopyFlags); + else + { + SetLastError(ERROR_PROC_NOT_FOUND); + } + + TRACE("got %u with %u\n", res, GetLastError()); + return (res == ROUTER_SUCCESS); +} + +/****************************************************************** * DeleteMonitorW (spoolss.@) * * Delete a specific Printmonitor from a Printing-Environment diff --git a/dlls/spoolss/spoolss.spec b/dlls/spoolss/spoolss.spec index ad1ea60..68188ba 100644 --- a/dlls/spoolss/spoolss.spec +++ b/dlls/spoolss/spoolss.spec @@ -8,7 +8,7 @@ @ stub AddPrintProcessorW @ stub AddPrintProvidorW @ stub AddPrinterConnectionW -@ stub AddPrinterDriverExW +@ stdcall AddPrinterDriverExW(wstr long ptr long) @ stub AddPrinterDriverW @ stub AddPrinterExW @ stub AddPrinterW

1 0

Detlef Riekenberg : spoolss: Implement AddMonitorW.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: f45cb5ce7fe9345fd045e6dc68d8e09ca4b7ef62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45cb5ce7fe9345fd045e6dc6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Feb 28 23:56:06 2009 +0100 spoolss: Implement AddMonitorW. --- dlls/spoolss/router.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/spoolss/spoolss.spec | 2 +- 2 files changed, 43 insertions(+), 1 deletions(-) diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index 28871b1..d5c4be3 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -313,6 +313,48 @@ static backend_t * backend_first(LPWSTR name) } /****************************************************************** + * AddMonitorW (spoolss.@) + * + * Install a Printmonitor + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * Level [I] Structure-Level (Must be 2) + * pMonitors [I] PTR to MONITOR_INFO_2 + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * All Files for the Monitor must already be copied to %winsysdir% ("%SystemRoot%\system32") + * + */ +BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors) +{ + backend_t * pb; + DWORD res = ROUTER_UNKNOWN; + + TRACE("(%s, %d, %p)\n", debugstr_w(pName), Level, pMonitors); + + if (Level != 2) { + SetLastError(ERROR_INVALID_LEVEL); + return FALSE; + } + + pb = backend_first(pName); + if (pb && pb->fpAddMonitor) + res = pb->fpAddMonitor(pName, Level, pMonitors); + else + { + SetLastError(ERROR_PROC_NOT_FOUND); + } + + TRACE("got %u with %u\n", res, GetLastError()); + return (res == ROUTER_SUCCESS); +} + +/****************************************************************** * EnumMonitorsW (spoolss.@) * * Enumerate available Port-Monitors diff --git a/dlls/spoolss/spoolss.spec b/dlls/spoolss/spoolss.spec index 010b490..8d9fae3 100644 --- a/dlls/spoolss/spoolss.spec +++ b/dlls/spoolss/spoolss.spec @@ -1,7 +1,7 @@ @ stub AbortPrinter @ stub AddFormW @ stub AddJobW -@ stub AddMonitorW +@ stdcall AddMonitorW(wstr long ptr) @ stub AddPerMachineConnectionW @ stub AddPortExW @ stub AddPortW

1 0

Detlef Riekenberg : spoolss: Implement DeleteMonitorW.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 393c3817b1d4e062ba22fed716c3eebd21f48d45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=393c3817b1d4e062ba22fed71… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 1 00:15:50 2009 +0100 spoolss: Implement DeleteMonitorW. --- dlls/spoolss/router.c | 34 ++++++++++++++++++++++++++++++++++ dlls/spoolss/spoolss.spec | 2 +- 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index d5c4be3..6fc7b59 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -355,6 +355,40 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors) } /****************************************************************** + * DeleteMonitorW (spoolss.@) + * + * Delete a specific Printmonitor from a Printing-Environment + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * pEnvironment [I] Printing-Environment of the Monitor or NULL (Default) + * pMonitorName [I] Name of the Monitor, that should be deleted + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + */ +BOOL WINAPI DeleteMonitorW(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorName) +{ + backend_t * pb; + DWORD res = ROUTER_UNKNOWN; + + TRACE("(%s, %s, %s)\n", debugstr_w(pName), debugstr_w(pEnvironment), debugstr_w(pMonitorName)); + + pb = backend_first(pName); + if (pb && pb->fpDeleteMonitor) + res = pb->fpDeleteMonitor(pName, pEnvironment, pMonitorName); + else + { + SetLastError(ERROR_PROC_NOT_FOUND); + } + + TRACE("got %u with %u\n", res, GetLastError()); + return (res == ROUTER_SUCCESS); +} + +/****************************************************************** * EnumMonitorsW (spoolss.@) * * Enumerate available Port-Monitors diff --git a/dlls/spoolss/spoolss.spec b/dlls/spoolss/spoolss.spec index 8d9fae3..ad1ea60 100644 --- a/dlls/spoolss/spoolss.spec +++ b/dlls/spoolss/spoolss.spec @@ -25,7 +25,7 @@ @ stub CreatePrinterIC @ stub DbgGetPointers @ stub DeleteFormW -@ stub DeleteMonitorW +@ stdcall DeleteMonitorW(wstr wstr wstr) @ stub DeletePerMachineConnectionW @ stub DeletePortW @ stub DeletePrintProcessorW

1 0

Gerald Pfeifer : comctl32: Simplify three TAB_ functions.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 2a7d98a52cf8cdca96de6d7c6f44539cf5b98dbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a7d98a52cf8cdca96de6d7c6… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Feb 28 23:53:33 2009 +0100 comctl32: Simplify three TAB_ functions. --- dlls/comctl32/tab.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 0cc8cf9..3880ceb 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -916,7 +916,7 @@ static LRESULT TAB_AdjustRect(const TAB_INFO *infoPtr, WPARAM fLarger, LPRECT pr * This method will handle the notification from the scroll control and * perform the scrolling operation on the tab control. */ -static LRESULT TAB_OnHScroll(TAB_INFO *infoPtr, int nScrollCode, int nPos, HWND hwndScroll) +static LRESULT TAB_OnHScroll(TAB_INFO *infoPtr, int nScrollCode, int nPos) { if(nScrollCode == SB_THUMBPOSITION && nPos != infoPtr->leftmostVisible) { @@ -2936,7 +2936,7 @@ static inline LRESULT TAB_Size (TAB_INFO *infoPtr) } -static LRESULT TAB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam) +static LRESULT TAB_Create (HWND hwnd, LPARAM lParam) { TAB_INFO *infoPtr; TEXTMETRICW fontMetrics; @@ -3076,7 +3076,7 @@ static LRESULT theme_changed(const TAB_INFO *infoPtr) return 0; } -static LRESULT TAB_NCCalcSize(HWND hwnd, WPARAM wParam, LPARAM lParam) +static LRESULT TAB_NCCalcSize(WPARAM wParam) { if (!wParam) return 0; @@ -3211,7 +3211,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TAB_SetFont (infoPtr, (HFONT)wParam); case WM_CREATE: - return TAB_Create (hwnd, wParam, lParam); + return TAB_Create (hwnd, lParam); case WM_NCDESTROY: return TAB_Destroy (infoPtr); @@ -3245,7 +3245,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TAB_SetRedraw (infoPtr, (BOOL)wParam); case WM_HSCROLL: - return TAB_OnHScroll(infoPtr, (int)LOWORD(wParam), (int)HIWORD(wParam), (HWND)lParam); + return TAB_OnHScroll(infoPtr, (int)LOWORD(wParam), (int)HIWORD(wParam)); case WM_STYLECHANGED: TAB_SetItemBounds (infoPtr); @@ -3270,7 +3270,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TAB_NCHitTest(infoPtr, lParam); case WM_NCCALCSIZE: - return TAB_NCCalcSize(hwnd, wParam, lParam); + return TAB_NCCalcSize(wParam); default: if (uMsg >= WM_USER && uMsg < WM_APP && !COMCTL32_IsReflectedMessage(uMsg))

1 0

Detlef Riekenberg : shdocvw/tests: Detect more interfaces in the webbrowser test.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 423ffdd10f949f6750526e56f8e4b0ab9d49e122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=423ffdd10f949f6750526e56f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 1 23:57:11 2009 +0100 shdocvw/tests: Detect more interfaces in the webbrowser test. --- dlls/shdocvw/tests/webbrowser.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 5aae312..17e7f81 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1355,14 +1355,22 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) *ppv = &Dispatch; else if(IsEqualGUID(&IID_IServiceProvider, riid)) *ppv = &ServiceProvider; + else if(IsEqualGUID(&IID_IDocHostShowUI, riid)) + trace("interface IID_IDocHostShowUI\n"); + else if(IsEqualGUID(&IID_IOleControlSite, riid)) + trace("interface IID_IOleControlSite\n"); + else if(IsEqualGUID(&IID_IOleCommandTarget, riid)) + trace("interface IID_IOleCommandTarget\n"); - if(*ppv) - return S_OK; + /* B6EA2050-048A-11D1-82B9-00C04FB9942E IAxWinHostWindow */ - /* are there more interfaces, that a host can support? */ - trace("%s: interface not supported\n", debugstr_guid(riid)); + else + { + /* are there more interfaces, that a host can support? */ + trace("%s: interface not supported\n", debugstr_guid(riid)); + } - return E_NOINTERFACE; + return (*ppv) ? S_OK : E_NOINTERFACE; } static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

1 0

Detlef Riekenberg : shdocvw/tests: Add IServiceProvider to the webbrowser test.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 41c0d35a7a9ef485cfd731104fe7b56926f828a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c0d35a7a9ef485cfd731104… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 1 23:09:02 2009 +0100 shdocvw/tests: Add IServiceProvider to the webbrowser test. --- dlls/shdocvw/tests/webbrowser.c | 69 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index c6c204a..5aae312 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -31,12 +31,14 @@ #include "htiframe.h" #include "mshtmhst.h" #include "mshtmcid.h" +#include "mshtml.h" #include "idispids.h" #include "olectl.h" #include "mshtmdid.h" #include "shobjidl.h" #include "shlguid.h" #include "exdispid.h" +#include "mimeinfo.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -1270,6 +1272,71 @@ static const IDocHostUIHandler2Vtbl DocHostUIHandlerVtbl = { static IDocHostUIHandler2 DocHostUIHandler = { &DocHostUIHandlerVtbl }; + +static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) +{ + return QueryInterface(riid, ppv); +} + +static ULONG WINAPI ServiceProvider_AddRef(IServiceProvider *iface) +{ + return 2; +} + +static ULONG WINAPI ServiceProvider_Release(IServiceProvider *iface) +{ + return 1; +} + +static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, + REFGUID guidService, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if (IsEqualGUID(&SID_STopLevelBrowser, guidService)) + trace("Service SID_STopLevelBrowser\n"); + else if (IsEqualGUID(&SID_SEditCommandTarget, guidService)) + trace("Service SID_SEditCommandTarget\n"); + else if (IsEqualGUID(&IID_ITargetFrame2, guidService)) + trace("Service IID_ITargetFrame2\n"); + else if (IsEqualGUID(&SID_SInternetSecurityManager, guidService)) + trace("Service SID_SInternetSecurityManager\n"); + else if (IsEqualGUID(&SID_SOleUndoManager, guidService)) + trace("Service SID_SOleUndoManager\n"); + else if (IsEqualGUID(&SID_IMimeInfo, guidService)) + trace("Service SID_IMimeInfo\n"); + else if (IsEqualGUID(&SID_STopWindow, guidService)) + trace("Service SID_STopWindow\n"); + + /* 30D02401-6A81-11D0-8274-00C04FD5AE38 Explorer Bar: Search */ + /* D1E7AFEC-6A2E-11D0-8C78-00C04FD918B4 no info */ + /* A9227C3C-7F8E-11D0-8CB0-00A0C92DBFE8 no info */ + /* 371EA634-DC5C-11D1-BA57-00C04FC2040E one reference to IVersionHost */ + /* 3050F429-98B5-11CF-BB82-00AA00BDCE0B IID_IElementBehaviorFactory */ + /* 6D12FE80-7911-11CF-9534-0000C05BAE0B SID_DefView */ + /* AD7F6C62-F6BD-11D2-959B-006097C553C8 no info */ + /* 53A2D5B1-D2FC-11D0-84E0-006097C9987D no info */ + /* 3050F312-98B5-11CF-BB82-00AA00BDCE0B HTMLFrameBaseClass */ + /* 639447BD-B2D3-44B9-9FB0-510F23CB45E4 no info */ + /* 20C46561-8491-11CF-960C-0080C7F4EE85 no info */ + + else + trace("Service %s not supported\n", debugstr_guid(guidService)); + + return E_NOINTERFACE; +} + + +static const IServiceProviderVtbl ServiceProviderVtbl = { + ServiceProvider_QueryInterface, + ServiceProvider_AddRef, + ServiceProvider_Release, + ServiceProvider_QueryService +}; + +static IServiceProvider ServiceProvider = { &ServiceProviderVtbl }; + + static HRESULT QueryInterface(REFIID riid, void **ppv) { *ppv = NULL; @@ -1286,6 +1353,8 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) *ppv = &DocHostUIHandler; else if(IsEqualGUID(&IID_IDispatch, riid)) *ppv = &Dispatch; + else if(IsEqualGUID(&IID_IServiceProvider, riid)) + *ppv = &ServiceProvider; if(*ppv) return S_OK;

1 0