December 2009 - Wine-commits

Gerald Pfeifer : winedbg: Use #elif defined(...) instead of plain #elif when detecting architectures in dbg_start_interactive ().
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: 0885d345b6406f0af347cd484163f8b5d931dc12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0885d345b6406f0af347cd484… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Dec 23 00:36:44 2009 +0100 winedbg: Use #elif defined(...) instead of plain #elif when detecting architectures in dbg_start_interactive(). --- programs/winedbg/winedbg.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 4aa0a3e..e2bc83a 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -610,11 +610,11 @@ void dbg_start_interactive(HANDLE hFile) struct backend_cpu* be_cpu; #ifdef __i386__ extern struct backend_cpu be_i386; -#elif __powerpc__ +#elif defined(__powerpc__) extern struct backend_cpu be_ppc; -#elif __ALPHA__ +#elif defined(__ALPHA__) extern struct backend_cpu be_alpha; -#elif __x86_64__ +#elif defined(__x86_64__) extern struct backend_cpu be_x86_64; #else # error CPU unknown

1 0

Christian Costa : ddraw: Improve error message.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: df9bddcd273ab5fa6aa1a998dcbf400672587324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df9bddcd273ab5fa6aa1a998d… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Dec 23 08:46:19 2009 +0100 ddraw: Improve error message. --- dlls/ddraw/executebuffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 996c558..2f42688 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -250,7 +250,7 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, TRACE("(%08x,%08x)\n", ci->u1.dlstLightStateType, ci->u2.dwArg[0]); if (!ci->u1.dlstLightStateType || (ci->u1.dlstLightStateType > D3DLIGHTSTATE_COLORVERTEX)) - ERR("Unexpected Light State Type\n"); + ERR("Unexpected Light State Type %d\n", ci->u1.dlstLightStateType); else if (ci->u1.dlstLightStateType == D3DLIGHTSTATE_MATERIAL /* 1 */) { DWORD matHandle = ci->u2.dwArg[0];

1 0

Christian Costa : drmclien: Add stub for DllRegisterServer.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: 1324a220b2aa56328a5b18ee88e2c6617fe6483f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1324a220b2aa56328a5b18ee8… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Dec 23 08:46:40 2009 +0100 drmclien: Add stub for DllRegisterServer. --- dlls/drmclien/drmclien.spec | 2 +- dlls/drmclien/main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/drmclien/drmclien.spec b/dlls/drmclien/drmclien.spec index b93472b..3a2f6e6 100644 --- a/dlls/drmclien/drmclien.spec +++ b/dlls/drmclien/drmclien.spec @@ -27,5 +27,5 @@ @ stub ?GetPublicKey(a)CDRMLiteCrypto@@QAEJPAUPKCERT@@@Z @ stub ?QueryXferToPMEx(a)CDRMLiteCrypto@@QAEJPBDKPAKPAEK2K12(a)Z @ stub ?RestoreLicenses(a)CDRMLiteCrypto@@QAEJKPAEPAGPAUIUnknown@@PAHPAX(a)Z -@ stub DllRegisterServer +@ stdcall DllRegisterServer() @ stub DllUnregisterServer diff --git a/dlls/drmclien/main.c b/dlls/drmclien/main.c index c18ddad..ed6b91e 100644 --- a/dlls/drmclien/main.c +++ b/dlls/drmclien/main.c @@ -25,6 +25,8 @@ #include "winbase.h" #include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(drmclien); + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch (fdwReason) @@ -40,3 +42,13 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +/*********************************************************************** + * DllRegisterServer (drmclien.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("Stub!\n"); + + return S_OK; +}

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLDocument2 get/put onmouseup .
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: a1f275448ff9c75e3c84dfc7ad5bc33a11d08514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1f275448ff9c75e3c84dfc7a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Dec 23 09:15:20 2009 +1100 mshtml: Implement IHTMLDocument2 get/put onmouseup. --- dlls/mshtml/htmldoc.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 84f6cc8..7a7b343 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1072,15 +1072,19 @@ static HRESULT WINAPI HTMLDocument_get_onkeypress(IHTMLDocument2 *iface, VARIANT static HRESULT WINAPI HTMLDocument_put_onmouseup(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_MOUSEUP, &v); } static HRESULT WINAPI HTMLDocument_get_onmouseup(IHTMLDocument2 *iface, VARIANT *p) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_MOUSEUP, p); } static HRESULT WINAPI HTMLDocument_put_onmousedown(IHTMLDocument2 *iface, VARIANT v)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLDocument2 get/ put onmousedown.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: cccaf1ab1902453a2def72bdcabac27b8bbe06fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cccaf1ab1902453a2def72bdc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Dec 23 09:18:45 2009 +1100 mshtml: Implement IHTMLDocument2 get/put onmousedown. --- dlls/mshtml/htmldoc.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 7a7b343..7371fb0 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1090,15 +1090,19 @@ static HRESULT WINAPI HTMLDocument_get_onmouseup(IHTMLDocument2 *iface, VARIANT static HRESULT WINAPI HTMLDocument_put_onmousedown(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + return set_doc_event(This, EVENTID_MOUSEDOWN, &v); } static HRESULT WINAPI HTMLDocument_get_onmousedown(IHTMLDocument2 *iface, VARIANT *p) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_MOUSEDOWN, p); } static HRESULT WINAPI HTMLDocument_put_onmousemove(IHTMLDocument2 *iface, VARIANT v)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLDocument2 get/ put onmouseout.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: f8aef2479598efd47b97dd55d49404fbde4a9e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8aef2479598efd47b97dd55d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Dec 23 09:21:04 2009 +1100 mshtml: Implement IHTMLDocument2 get/put onmouseout. --- dlls/mshtml/htmldoc.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 7371fb0..1e97d46 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1122,15 +1122,19 @@ static HRESULT WINAPI HTMLDocument_get_onmousemove(IHTMLDocument2 *iface, VARIAN static HRESULT WINAPI HTMLDocument_put_onmouseout(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_MOUSEOUT, &v); } static HRESULT WINAPI HTMLDocument_get_onmouseout(IHTMLDocument2 *iface, VARIANT *p) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_MOUSEOUT, p); } static HRESULT WINAPI HTMLDocument_put_onmouseover(IHTMLDocument2 *iface, VARIANT v)

1 0

Andrew Eikum : hlink: Add tests and fix error handling in IHlink::{Get, Set}StringReference.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: fc4a9e2e69316818292bfa360d7b3f40aefed931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc4a9e2e69316818292bfa360… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Dec 22 17:43:26 2009 -0600 hlink: Add tests and fix error handling in IHlink::{Get, Set}StringReference. --- dlls/hlink/link.c | 21 +++++++++- dlls/hlink/tests/hlink.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 3 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 30530ca..78b6c1e 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -245,6 +245,10 @@ static HRESULT WINAPI IHlink_fnSetStringReference(IHlink* iface, TRACE("(%p)->(%i %s %s)\n", This, grfHLSETF, debugstr_w(pwzTarget), debugstr_w(pwzLocation)); + if(grfHLSETF > (HLINKSETF_TARGET | HLINKSETF_LOCATION) && + grfHLSETF < -(HLINKSETF_TARGET | HLINKSETF_LOCATION)) + return grfHLSETF; + if (grfHLSETF & HLINKSETF_TARGET) { heap_free(This->Target); @@ -281,7 +285,20 @@ static HRESULT WINAPI IHlink_fnGetStringReference (IHlink* iface, { HlinkImpl *This = (HlinkImpl*)iface; - FIXME("(%p) -> (%i %p %p)\n", This, dwWhichRef, ppwzTarget, ppwzLocation); + TRACE("(%p) -> (%i %p %p)\n", This, dwWhichRef, ppwzTarget, ppwzLocation); + + /* note: undocumented behavior with dwWhichRef == -1 */ + if(dwWhichRef != -1 && dwWhichRef & ~(HLINKGETREF_DEFAULT | HLINKGETREF_ABSOLUTE | HLINKGETREF_RELATIVE)) + { + if(ppwzTarget) + *ppwzTarget = NULL; + if(ppwzLocation) + *ppwzLocation = NULL; + return E_INVALIDARG; + } + + if(dwWhichRef != HLINKGETREF_DEFAULT) + FIXME("unhandled flags: 0x%x\n", dwWhichRef); if (ppwzTarget) { @@ -300,8 +317,6 @@ static HRESULT WINAPI IHlink_fnGetStringReference (IHlink* iface, IBindCtx_Release(pbc); IMoniker_Release(mon); } - else - FIXME("Unhandled case, no set Target and no moniker\n"); } } if (ppwzLocation) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 1a7536f..6999187 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -1121,6 +1121,100 @@ static void test_HlinkGetSetMonikerReference(void) IMoniker_Release(dummy); } +static void test_HlinkGetSetStringReference(void) +{ + IHlink *link; + static const WCHAR one[] = {'1',0}; + static const WCHAR two[] = {'2',0}; + static const WCHAR three[] = {'3',0}; + static const WCHAR empty[] = {0}; + WCHAR *fnd_tgt, *fnd_loc; + HRESULT hres; + + /* create a new hlink: target => NULL, location => one */ + hres = HlinkCreateFromMoniker(NULL, one, empty, NULL, 0, NULL, &IID_IHlink, (void**)&link); + ok(hres == S_OK, "HlinkCreateFromMoniker failed: 0x%08x\n", hres); + + /* test setting/getting location */ + hres = IHlink_GetStringReference(link, HLINKGETREF_DEFAULT, &fnd_tgt, &fnd_loc); + ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); + ok(fnd_tgt == NULL, "Found target should have been NULL, was: %s\n", wine_dbgstr_w(fnd_tgt)); + ok(!lstrcmpW(fnd_loc, one), "Found location should have been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(fnd_loc)); + + hres = IHlink_SetStringReference(link, HLINKSETF_LOCATION, one, two); + ok(hres == S_OK, "IHlink_SetStringReference failed: 0x%08x\n", hres); + + hres = IHlink_GetStringReference(link, HLINKGETREF_DEFAULT, &fnd_tgt, &fnd_loc); + ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); + ok(fnd_tgt == NULL, "Found target should have been NULL, was: %s\n", wine_dbgstr_w(fnd_tgt)); + ok(!lstrcmpW(fnd_loc, two), "Found location should have been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(fnd_loc)); + + hres = IHlink_SetStringReference(link, -HLINKSETF_LOCATION, two, one); + ok(hres == S_OK, "IHlink_SetStringReference failed: 0x%08x\n", hres); + + hres = IHlink_GetStringReference(link, HLINKGETREF_DEFAULT, &fnd_tgt, &fnd_loc); + ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); + ok(fnd_tgt == NULL, "Found target should have been NULL, was: %s\n", wine_dbgstr_w(fnd_tgt)); + ok(!lstrcmpW(fnd_loc, one), "Found location should have been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(fnd_loc)); + + /* test setting/getting target */ + hres = IHlink_SetStringReference(link, HLINKSETF_TARGET, two, three); + ok(hres == S_OK, "IHlink_SetStringReference failed: 0x%08x\n", hres); + + hres = IHlink_GetStringReference(link, HLINKGETREF_DEFAULT, &fnd_tgt, &fnd_loc); + ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); + ok(!lstrcmpW(fnd_tgt, two), "Found target should have been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(fnd_tgt)); + ok(!lstrcmpW(fnd_loc, one), "Found location should have been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(fnd_loc)); + + hres = IHlink_SetStringReference(link, -HLINKSETF_TARGET, three, two); + ok(hres == S_OK, "IHlink_SetStringReference failed: 0x%08x\n", hres); + + hres = IHlink_GetStringReference(link, HLINKGETREF_DEFAULT, &fnd_tgt, &fnd_loc); + ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); + ok(!lstrcmpW(fnd_tgt, three), "Found target should have been %s, was: %s\n", wine_dbgstr_w(three), wine_dbgstr_w(fnd_tgt)); + ok(!lstrcmpW(fnd_loc, two), "Found location should have been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(fnd_loc)); + + /* test setting/getting both */ + hres = IHlink_SetStringReference(link, HLINKSETF_TARGET | HLINKSETF_LOCATION, one, two); + ok(hres == S_OK, "IHlink_SetStringReference failed: 0x%08x\n", hres); + + hres = IHlink_GetStringReference(link, HLINKGETREF_DEFAULT, &fnd_tgt, &fnd_loc); + ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); + ok(!lstrcmpW(fnd_tgt, one), "Found target should have been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(fnd_tgt)); + ok(!lstrcmpW(fnd_loc, two), "Found location should have been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(fnd_loc)); + + hres = IHlink_SetStringReference(link, -(HLINKSETF_TARGET | HLINKSETF_LOCATION), three, one); + ok(hres == S_OK, "IHlink_SetStringReference failed: 0x%08x\n", hres); + + hres = IHlink_GetStringReference(link, HLINKGETREF_DEFAULT, &fnd_tgt, &fnd_loc); + ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); + ok(!lstrcmpW(fnd_tgt, three), "Found target should have been %s, was: %s\n", wine_dbgstr_w(three), wine_dbgstr_w(fnd_tgt)); + ok(!lstrcmpW(fnd_loc, two), "Found location should have been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(fnd_loc)); + + /* test invalid flags/params */ + hres = IHlink_GetStringReference(link, 4, &fnd_tgt, &fnd_loc); + ok(hres == E_INVALIDARG, "IHlink_GetStringReference should have failed " + "with E_INVALIDARG (0x%08x), instead: 0x%08x\n", E_INVALIDARG, hres); + ok(fnd_tgt == NULL, "Found target should have been NULL, was: %s\n", wine_dbgstr_w(fnd_tgt)); + ok(fnd_loc == NULL, "Found location should have been NULL, was: %s\n", wine_dbgstr_w(fnd_loc)); + + hres = IHlink_GetStringReference(link, -1, &fnd_tgt, &fnd_loc); + todo_wine ok(hres == E_FAIL, "IHlink_GetStringReference should have failed " + "with E_FAIL (0x%08x), instead: 0x%08x\n", E_FAIL, hres); + + hres = IHlink_GetStringReference(link, -2, &fnd_tgt, &fnd_loc); + ok(hres == E_INVALIDARG, "IHlink_GetStringReference should have failed " + "with E_INVALIDARG (0x%08x), instead: 0x%08x\n", E_INVALIDARG, hres); + + hres = IHlink_SetStringReference(link, 4, NULL, NULL); + ok(hres == 4, "IHlink_SetStringReference should have failed with 0x4, instead: 0x%08x\n", hres); + + hres = IHlink_SetStringReference(link, -4, NULL, NULL); + ok(hres == -4, "IHlink_SetStringReference should have failed with 0xFFFFFFFC, instead: 0x%08x\n", hres); + + IHlink_Release(link); +} + START_TEST(hlink) { CoInitialize(NULL); @@ -1133,6 +1227,7 @@ START_TEST(hlink) test_HlinkParseDisplayName(); test_HlinkResolveMonikerForData(); test_HlinkGetSetMonikerReference(); + test_HlinkGetSetStringReference(); CoUninitialize(); }

1 0

Andrew Eikum : hlink: Add partial implementation of IHlinkBrowseContext:: GetHlink.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: 7ba24349757fe0179f533f76dae8e925690c123b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ba24349757fe0179f533f76d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Dec 22 17:43:29 2009 -0600 hlink: Add partial implementation of IHlinkBrowseContext::GetHlink. --- dlls/hlink/browse_ctx.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index f0274b0..a5b73c1 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -223,8 +223,19 @@ static HRESULT WINAPI IHlinkBC_QueryHlink( IHlinkBrowseContext* iface, static HRESULT WINAPI IHlinkBC_GetHlink( IHlinkBrowseContext* iface, ULONG uHLID, IHlink** ppihl) { - FIXME("\n"); - return E_NOTIMPL; + HlinkBCImpl *This = (HlinkBCImpl*)iface; + + TRACE("(%p)->(%x %p)\n", This, uHLID, ppihl); + + if(uHLID != HLID_CURRENT) { + FIXME("Only HLID_CURRENT implemented, given: %x\n", uHLID); + return E_NOTIMPL; + } + + *ppihl = This->CurrentPage; + IHlink_AddRef(*ppihl); + + return S_OK; } static HRESULT WINAPI IHlinkBC_SetCurrentHlink( IHlinkBrowseContext* iface,

1 0

Andrew Eikum : hlink: Add tests for IHlinkBrowseContext::SetInitialHlink.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: 7255944064a3845d968e4420a38b169c3f73acb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7255944064a3845d968e4420a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Dec 22 17:43:31 2009 -0600 hlink: Add tests for IHlinkBrowseContext::SetInitialHlink. --- dlls/hlink/tests/Makefile.in | 1 + dlls/hlink/tests/browse_ctx.c | 74 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 0 deletions(-) diff --git a/dlls/hlink/tests/Makefile.in b/dlls/hlink/tests/Makefile.in index 168e9d6..71ad118 100644 --- a/dlls/hlink/tests/Makefile.in +++ b/dlls/hlink/tests/Makefile.in @@ -6,6 +6,7 @@ TESTDLL = hlink.dll IMPORTS = hlink ole32 kernel32 CTESTS = \ + browse_ctx.c \ hlink.c @MAKE_TEST_RULES@ diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c new file mode 100644 index 0000000..637f3c8 --- /dev/null +++ b/dlls/hlink/tests/browse_ctx.c @@ -0,0 +1,74 @@ +/* + * Copyright 2009 Andrew Eikum for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdio.h> + +#include <hlink.h> + +#include "wine/test.h" + +static void test_SetInitialHlink(void) +{ + IHlinkBrowseContext *bc; + IHlink *found_hlink; + IMoniker *dummy, *found_moniker; + IBindCtx *bindctx; + WCHAR one[] = {'1',0}; + WCHAR friend[] = {'f','r','i','e','n','d',0}; + WCHAR *found_name; + HRESULT hres; + + hres = CreateItemMoniker(one, one, &dummy); + ok(hres == S_OK, "CreateItemMoniker failed: 0x%08x\n", hres); + + hres = HlinkCreateBrowseContext(NULL, &IID_IHlinkBrowseContext, (void**)&bc); + ok(hres == S_OK, "HlinkCreateBrowseContext failed: 0x%08x\n", hres); + + hres = IHlinkBrowseContext_SetInitialHlink(bc, dummy, one, friend); + ok(hres == S_OK, "SetInitialHlink failed: 0x%08x\n", hres); + + hres = IHlinkBrowseContext_GetHlink(bc, HLID_CURRENT, &found_hlink); + ok(hres == S_OK, "GetHlink failed: 0x%08x\n", hres); + + hres = IHlink_GetMonikerReference(found_hlink, HLINKGETREF_DEFAULT, &found_moniker, NULL); + ok(hres == S_OK, "GetMonikerReference failed: 0x%08x\n", hres); + + hres = CreateBindCtx(0, &bindctx); + ok(hres == S_OK, "CreateBindCtx failed: 0x%08x\n", hres); + + hres = IMoniker_GetDisplayName(found_moniker, bindctx, NULL, &found_name); + ok(hres == S_OK, "GetDisplayName failed: 0x%08x\n", hres); + ok(lstrcmpW(found_name, friend), "Found display name should have been %s, was: %s\n", wine_dbgstr_w(friend), wine_dbgstr_w(found_name)); + + IBindCtx_Release(bindctx); + IMoniker_Release(found_moniker); + IHlink_Release(found_hlink); + IHlinkBrowseContext_Release(bc); + IMoniker_Release(dummy); +} + +START_TEST(browse_ctx) +{ + CoInitialize(NULL); + + test_SetInitialHlink(); + + CoUninitialize(); +}

1 0

Henri Verbeet : wined3d: Use proper enum elements for FOURCC formats.
by Alexandre Julliard 23 Dec '09

23 Dec '09

Module: wine Branch: master Commit: 3288911ae3e3cbd7124ed60d805ff3310f6a21c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3288911ae3e3cbd7124ed60d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 22 18:32:17 2009 +0100 wined3d: Use proper enum elements for FOURCC formats. --- dlls/wined3d/wined3d_private.h | 4 ++++ include/wine/wined3d.idl | 33 +++++++++++++++------------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7f1fc13..489137c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2894,4 +2894,8 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL" +#define WINEMAKEFOURCC(ch0, ch1, ch2, ch3) \ + ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ + ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) + #endif diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 27267c2..7196a98 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -253,27 +253,24 @@ typedef enum _WINED3DFORMAT WINED3DFMT_B5G5R5A1_UNORM, WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8X8_UNORM, + /* FOURCC formats. */ + WINED3DFMT_UYVY = 0x59565955, /* UYVY */ + WINED3DFMT_YUY2 = 0x32595559, /* YUY2 */ + WINED3DFMT_YV12 = 0x32315659, /* YV12 */ + WINED3DFMT_DXT1 = 0x31545844, /* DXT1 */ + WINED3DFMT_DXT2 = 0x32545844, /* DXT2 */ + WINED3DFMT_DXT3 = 0x33545844, /* DXT3 */ + WINED3DFMT_DXT4 = 0x34545844, /* DXT4 */ + WINED3DFMT_DXT5 = 0x35545844, /* DXT5 */ + WINED3DFMT_MULTI2_ARGB8 = 0x3154454d, /* MET1 */ + WINED3DFMT_G8R8_G8B8 = 0x42475247, /* GRGB */ + WINED3DFMT_R8G8_B8G8 = 0x47424752, /* RGBG */ + WINED3DFMT_ATI2N = 0x32495441, /* ATI2 */ + WINED3DFMT_NVHU = 0x5548564e, /* NVHU */ + WINED3DFMT_NVHS = 0x5348564e, /* NVHS */ WINED3DFMT_FORCE_DWORD = 0xffffffff } WINED3DFORMAT; -cpp_quote("#define WINEMAKEFOURCC(ch0, ch1, ch2, ch3) \\") -cpp_quote(" ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \\") -cpp_quote(" ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 ))") -cpp_quote("#define WINED3DFMT_UYVY WINEMAKEFOURCC('U', 'Y', 'V', 'Y')") -cpp_quote("#define WINED3DFMT_YUY2 WINEMAKEFOURCC('Y', 'U', 'Y', '2')") -cpp_quote("#define WINED3DFMT_YV12 WINEMAKEFOURCC('Y', 'V', '1', '2')") -cpp_quote("#define WINED3DFMT_DXT1 WINEMAKEFOURCC('D', 'X', 'T', '1')") -cpp_quote("#define WINED3DFMT_DXT2 WINEMAKEFOURCC('D', 'X', 'T', '2')") -cpp_quote("#define WINED3DFMT_DXT3 WINEMAKEFOURCC('D', 'X', 'T', '3')") -cpp_quote("#define WINED3DFMT_DXT4 WINEMAKEFOURCC('D', 'X', 'T', '4')") -cpp_quote("#define WINED3DFMT_DXT5 WINEMAKEFOURCC('D', 'X', 'T', '5')") -cpp_quote("#define WINED3DFMT_MULTI2_ARGB8 WINEMAKEFOURCC('M', 'E', 'T', '1')") -cpp_quote("#define WINED3DFMT_G8R8_G8B8 WINEMAKEFOURCC('G', 'R', 'G', 'B')") -cpp_quote("#define WINED3DFMT_R8G8_B8G8 WINEMAKEFOURCC('R', 'G', 'B', 'G')") -/* Vendor specific formats */ -cpp_quote("#define WINED3DFMT_ATI2N WINEMAKEFOURCC('A', 'T', 'I', '2')") -cpp_quote("#define WINED3DFMT_NVHU WINEMAKEFOURCC('N', 'V', 'H', 'U')") -cpp_quote("#define WINED3DFMT_NVHS WINEMAKEFOURCC('N', 'V', 'H', 'S')") typedef enum _WINED3DRENDERSTATETYPE {

1 0