June 2006 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Added optary.idl file.
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: bc29a20d8b3dcd1949ed6c09eefd0c6bcaa9bc65 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bc29a20d8b3dcd1949ed6c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 22 16:12:18 2006 +0200 mshtml: Added optary.idl file. --- dlls/mshtml/main.c | 2 +- dlls/uuid/uuid.c | 1 + include/.gitignore | 1 + include/Makefile.in | 1 + include/optary.idl | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 69 insertions(+), 1 deletions(-) create mode 100644 include/optary.idl diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index d3d533a..94dfcc1 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -35,6 +35,7 @@ #include "winreg.h" #include "ole2.h" #include "advpub.h" #include "shlwapi.h" +#include "optary.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -236,7 +237,6 @@ DEFINE_GUID(CLSID_CSvrOMUses, 0x3050F4F0 DEFINE_GUID(CLSID_CrSource, 0x65014010, 0x9F62, 0x11D1, 0xA6,0x51, 0x00,0x60,0x08,0x11,0xD5,0xCE); DEFINE_GUID(CLSID_ExternalFrameworkSite, 0x3050F163, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_HTADocument, 0x3050F5C8, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); -DEFINE_GUID(CLSID_HTMLLoadOptions, 0x18845040, 0x0FA5, 0x11D1, 0xBA,0x19, 0x00,0xC0,0x4F,0xD9,0x12,0xD0); DEFINE_GUID(CLSID_HTMLPluginDocument, 0x25336921, 0x03F9, 0x11CF, 0x8F,0xD0, 0x00,0xAA,0x00,0x68,0x6F,0x13); DEFINE_GUID(CLSID_HTMLPopup, 0x3050F667, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_HTMLPopupDoc, 0x3050F67D, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 2b30313..20116ee 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -63,6 +63,7 @@ #include "xmldom.h" #include "downloadmgr.h" #include "objsel.h" #include "hlink.h" +#include "optary.h" /* FIXME: cguids declares GUIDs but does not define their values */ diff --git a/include/.gitignore b/include/.gitignore index 6621690..762edb8 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -26,6 +26,7 @@ objidl.h objsafe.h ocidl.h oleidl.h +optary.h propidl.h pstore.h richole.h diff --git a/include/Makefile.in b/include/Makefile.in index 75d928d..02a009b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -31,6 +31,7 @@ WINDOWS_IDL_SRCS = \ objsafe.idl \ ocidl.idl \ oleidl.idl \ + optary.idl \ propidl.idl \ pstore.idl \ richole.idl \ diff --git a/include/optary.idl b/include/optary.idl new file mode 100644 index 0000000..b0c49e6 --- /dev/null +++ b/include/optary.idl @@ -0,0 +1,65 @@ +/* + * Copyright 2006 Jacek Caban 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 + */ + +import "objidl.idl"; +import "oleidl.idl"; + +/***************************************************************************** + * IOptionArray interface + */ +[ + local, + object, + uuid(22b6d492-0f88-11d1-ba19-00c04fd912d0), + pointer_default(unique) +] +interface IOptionArray : IUnknown +{ + typedef [unique] IOptionArray *LPOPTIONARRAY; + + HRESULT QueryOption( + [in] DWORD dwOption, + [out, size_is(*pcbBuf)] LPVOID pBuffer, + [in, out] ULONG *pcbBuf); + + HRESULT SetOption( + [in] DWORD dwOption, + [in, size_is(cbBuf)] LPVOID pBuffer, + [in] ULONG cbBuf); +} + +/***************************************************************************** + * IHtmlLoadOptions interface + */ +[ + local, + object, + uuid(a71a0808-0f88-11d1-ba19-00c04fd912d0), + pointer_default(unique) +] +interface IHtmlLoadOptions : IOptionArray +{ + typedef enum { + HTMLLOADOPTION_CODEPAGE, + HTMLLOADOPTION_INETSHORTCUTPATH, + HTMLLOADOPTION_HYPERLINK, + HTMLLOADOPTION_FRAMELOAD + } HTMLLOADOPTION; +} + +cpp_quote("DEFINE_GUID(CLSID_HTMLLoadOptions, 0x18845040, 0x0FA5, 0x11D1, 0xBA,0x19, 0x00,0xC0,0x4F,0xD9,0x12,0xD0);")

1 0

Jacek Caban : mshtml: Inherit NSContainer in NewURI.
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: 76d8d022ca94a2c0dd9c2ded4f67244b1351b2e6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=76d8d022ca94a2c0dd9c2de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 22 16:09:29 2006 +0200 mshtml: Inherit NSContainer in NewURI. --- dlls/mshtml/nsio.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index c3269fc..c465154 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1377,6 +1377,7 @@ static nsresult NSAPI nsIOService_NewURI const char *aOriginCharset, nsIURI *aBaseURI, nsIURI **_retval) { const char *spec = NULL; + NSContainer *nscontainer = NULL; nsIURI *uri; PRBool is_javascript = FALSE; nsresult nsres; @@ -1416,7 +1417,24 @@ static nsresult NSAPI nsIOService_NewURI return NS_OK; } - return create_uri(uri, NULL, _retval); + if(aBaseURI) { + nsIWineURI *wine_uri; + + nsres = nsIURI_QueryInterface(aBaseURI, &IID_nsIWineURI, (void**)&wine_uri); + if(NS_SUCCEEDED(nsres)) { + nsIWineURI_GetNSContainer(wine_uri, &nscontainer); + nsIWineURI_Release(wine_uri); + }else { + ERR("Could not get nsIWineURI: %08lx\n", nsres); + } + } + + nsres = create_uri(uri, nscontainer, _retval); + + if(nscontainer) + nsIWebBrowserChrome_Release(NSWBCHROME(nscontainer)); + + return nsres; } static nsresult NSAPI nsIOService_NewFileURI(nsIIOService *iface, nsIFile *aFile,

1 0

Jacek Caban : mshtml: Fix a typo.
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: 7ceaf5b38683169a62fda78787f09e879aaad3c0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7ceaf5b38683169a62fda78… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 22 16:09:10 2006 +0200 mshtml: Fix a typo. --- dlls/mshtml/conpoint.c | 3 ++- dlls/mshtml/tests/htmldoc.c | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index 2ff410c..480814a 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -201,7 +201,7 @@ static HRESULT WINAPI ConnectionPointCon *ppCP = CONPOINT(This->cp_htmldocevents2); }else if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { TRACE("(%p)->(IID_IPropertyNotifySink %p)\n", This, ppCP); - *ppCP = CONPOINT(This->cp_htmldocevents); + *ppCP = CONPOINT(This->cp_propnotif); } if(*ppCP) { @@ -227,6 +227,7 @@ void HTMLDocument_ConnectionPoints_Init( { This->lpConnectionPointContainerVtbl = &ConnectionPointContainerVtbl; + ConnectionPoint_Create(This, &IID_IPropertyNotifySink, &This->cp_propnotif); ConnectionPoint_Create(This, &DIID_HTMLDocumentEvents, &This->cp_htmldocevents); ConnectionPoint_Create(This, &DIID_HTMLDocumentEvents2, &This->cp_htmldocevents2); } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index fca371b..78ce95b 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -1295,6 +1295,7 @@ static void test_ConnectionPointContaine if(FAILED(hres)) return; + test_ConnectionPoint(container, &IID_IPropertyNotifySink); test_ConnectionPoint(container, &DIID_HTMLDocumentEvents); test_ConnectionPoint(container, &DIID_HTMLDocumentEvents2);

1 0

Jacek Caban : mshtml: Added CGID_MSHTML to IOleCommandTarget::Exec.
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: e82be4ba634dc4ea65b38997814c19a139031ec1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e82be4ba634dc4ea65b3899… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 22 16:07:52 2006 +0200 mshtml: Added CGID_MSHTML to IOleCommandTarget::Exec. --- dlls/mshtml/olecmd.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 3ee069e..1881062 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -373,6 +373,9 @@ static HRESULT WINAPI OleCommandTarget_E }else if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { FIXME("unsupported nCmdID %ld of CGID_ShellDocView group\n", nCmdID); return OLECMDERR_E_NOTSUPPORTED; + }else if(IsEqualGUID(&CGID_MSHTML, pguidCmdGroup)) { + FIXME("unsupported nCmdID %ld of CGID_MSHTML group\n", nCmdID); + return OLECMDERR_E_NOTSUPPORTED; } FIXME("Unsupported pguidCmdGroup %s\n", debugstr_guid(pguidCmdGroup));

1 0

Juan Lang : advapi: Add a stub for SystemFunction035.
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: 2a6dda1cb40643cdd3bb141157a98dda7a06bd44 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2a6dda1cb40643cdd3bb141… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Jun 23 00:15:24 2006 -0700 advapi: Add a stub for SystemFunction035. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/crypt.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 7e6880e..438b671 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -629,7 +629,7 @@ # @ stub StopTraceW @ stdcall SystemFunction032(ptr ptr) @ stub SystemFunction033 @ stub SystemFunction034 -@ stub SystemFunction035 +@ stdcall SystemFunction035(str) @ stdcall SystemFunction036(ptr long) # RtlGenRandom @ stdcall SystemFunction040(ptr long long) # RtlEncryptMemory @ stdcall SystemFunction041(ptr long long) # RtlDecryptMemory diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 893bdc9..01be73b 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -1984,6 +1984,21 @@ BOOL WINAPI SystemFunction030(PVOID b1, } /****************************************************************************** + * SystemFunction035 (ADVAPI32.@) + * + * Described here: +http://disc.server.com/discussion.cgi?disc=148775;article=942;title=Coding%2FASM%2FSystem + * + * NOTES + * Stub, always return TRUE. + */ +BOOL WINAPI SystemFunction035(LPCSTR lpszDllFilePath) +{ + FIXME("%s: stub\n", debugstr_a(lpszDllFilePath)); + return TRUE; +} + +/****************************************************************************** * SystemFunction036 (ADVAPI32.@) * * MSDN documents this function as RtlGenRandom and declares it in ntsecapi.h

1 0

Juan Lang : kernel: Change failing to test to show it doesn' t have anything to do
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: 91ac4b553475eea222f46517f46c07562b30755f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=91ac4b553475eea222f4651… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Jun 23 00:14:05 2006 -0700 kernel: Change failing to test to show it doesn't have anything to do with embedded NULLs. --- dlls/kernel/tests/locale.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/tests/locale.c b/dlls/kernel/tests/locale.c index d7c0eee..565f998 100644 --- a/dlls/kernel/tests/locale.c +++ b/dlls/kernel/tests/locale.c @@ -941,8 +941,8 @@ static void test_CompareStringA(void) ret = CompareStringA(lcid, 0, "a\0b", 4, "a", 2); ok(ret == 3, "a\\0b vs a expected 3, got %d\n", ret); - ret = CompareStringA(lcid, 0, "\1\0\2", 4, "\1\0\1", 4); - todo_wine ok(ret != 2, "\\1\\0\\2 vs \\1\\0\\1 expected unequal\n"); + ret = CompareStringA(lcid, 0, "\2", 2, "\1", 2); + todo_wine ok(ret != 2, "\\2 vs \\1 expected unequal\n"); } static void test_LCMapStringA(void)

1 0

Andrew Talbot : secur32: Write-strings warnings fix.
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: e239953e51fe61754618fab1ef48841b09eca365 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e239953e51fe61754618fab… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jun 22 20:42:08 2006 +0100 secur32: Write-strings warnings fix. --- dlls/secur32/ntlm.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 97cecba..8d8f318 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -122,6 +122,8 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ac { static const char username_arg[] = "--username="; static const char domain_arg[] = "--domain="; + static char ntlm_auth[] = "ntlm_auth"; + static char helper_protocol[] = "--helper-protocol=ntlmssp-client-1"; int unixcp_size; if(pAuthData == NULL) @@ -187,8 +189,8 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ac -1, client_domain_arg + sizeof(domain_arg) - 1, unixcp_size - sizeof(domain) + 1, NULL, NULL); - client_argv[0] = "ntlm_auth"; - client_argv[1] = "--helper-protocol=ntlmssp-client-1"; + client_argv[0] = ntlm_auth; + client_argv[1] = helper_protocol; client_argv[2] = client_user_arg; client_argv[3] = client_domain_arg; client_argv[4] = NULL;

1 0

Andrew Talbot : ole32/tests: Write-strings warning fix.
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: d69745ff7abae0ac31b7828f0e1ea446a5325d83 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d69745ff7abae0ac31b7828… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jun 22 19:23:13 2006 +0100 ole32/tests: Write-strings warning fix. --- dlls/ole32/tests/stg_prop.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/stg_prop.c b/dlls/ole32/tests/stg_prop.c index 66825c9..5cd8879 100644 --- a/dlls/ole32/tests/stg_prop.c +++ b/dlls/ole32/tests/stg_prop.c @@ -261,6 +261,7 @@ static void testCodepage(void) { static const WCHAR szDot[] = { '.',0 }; static const WCHAR szPrefix[] = { 's','t','g',0 }; + static CHAR aval[] = "hi"; static const WCHAR wval[] = { 'h','i',0 }; HRESULT hr; IStorage *storage = NULL; @@ -323,7 +324,7 @@ static void testCodepage(void) spec.ulKind = PRSPEC_PROPID; U(spec).propid = PID_FIRST_USABLE; var.vt = VT_LPSTR; - U(var).pszVal = "hi"; + U(var).pszVal = aval; hr = IPropertyStorage_WriteMultiple(propertyStorage, 1, &spec, &var, 0); ok(SUCCEEDED(hr), "WriteMultiple failed: 0x%08lx\n", hr); hr = IPropertyStorage_ReadMultiple(propertyStorage, 1, &spec, &var);

1 0

Vitaliy Margolen : dinput: Warp mouse each 10ms instead of dropping events.
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: 101e9e64e6748951bf0b733829de405defb354bd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=101e9e64e6748951bf0b733… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Thu Jun 22 07:30:52 2006 -0600 dinput: Warp mouse each 10ms instead of dropping events. --- dlls/dinput/mouse.c | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 8bd395e..e626bf6 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -136,6 +136,7 @@ struct SysMouseImpl /* warping: whether we need to move mouse back to middle once we * reach window borders (for e.g. shooters, "surface movement" games) */ WARP_STATUS need_warp; + DWORD last_warped; int acquired; HANDLE hEvent; CRITICAL_SECTION crit; @@ -418,7 +419,6 @@ static LRESULT CALLBACK dinput_mouse_hoo MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam; SysMouseImpl* This = (SysMouseImpl*) current_lock; DWORD dwCoop; - static long last_event = 0; int wdata; if (code != HC_ACTION) return CallNextHookEx( 0, code, wparam, lparam ); @@ -426,16 +426,6 @@ static LRESULT CALLBACK dinput_mouse_hoo EnterCriticalSection(&(This->crit)); dwCoop = This->dwCoopLevel; - /* Only allow mouse events every 10 ms. - * This is to allow the cursor to start acceleration before - * the warps happen. But if it involves a mouse button event we - * allow it since we don't want to lose the clicks. - */ - if (((GetCurrentTime() - last_event) < 10) - && wparam == WM_MOUSEMOVE) - goto end; - else last_event = GetCurrentTime(); - /* Mouse moved -> send event if asked */ if (This->hEvent) SetEvent(This->hEvent); @@ -623,6 +613,8 @@ static HRESULT WINAPI SysMouseAImpl_Acqu MapWindowPoints(This->win, HWND_DESKTOP, &This->mapped_center, 1); TRACE("Warping mouse to %ld - %ld\n", This->mapped_center.x, This->mapped_center.y); SetCursorPos( This->mapped_center.x, This->mapped_center.y ); + This->last_warped = GetCurrentTime(); + #ifdef MOUSE_HACK This->need_warp = WARP_DONE; #else @@ -698,11 +690,12 @@ static HRESULT WINAPI SysMouseAImpl_GetD } /* Check if we need to do a mouse warping */ - if (This->need_warp == WARP_NEEDED) { + if (This->need_warp == WARP_NEEDED && (GetCurrentTime() - This->last_warped > 10)) { dinput_window_check(This); TRACE("Warping mouse to %ld - %ld\n", This->mapped_center.x, This->mapped_center.y); SetCursorPos( This->mapped_center.x, This->mapped_center.y ); - + This->last_warped = GetCurrentTime(); + #ifdef MOUSE_HACK This->need_warp = WARP_DONE; #else @@ -791,11 +784,12 @@ static HRESULT WINAPI SysMouseAImpl_GetD LeaveCriticalSection(&(This->crit)); /* Check if we need to do a mouse warping */ - if (This->need_warp == WARP_NEEDED) { + if (This->need_warp == WARP_NEEDED && (GetCurrentTime() - This->last_warped > 10)) { dinput_window_check(This); TRACE("Warping mouse to %ld - %ld\n", This->mapped_center.x, This->mapped_center.y); SetCursorPos( This->mapped_center.x, This->mapped_center.y ); - + This->last_warped = GetCurrentTime(); + #ifdef MOUSE_HACK This->need_warp = WARP_DONE; #else

1 0

Paul Vriens : uxtheme/tests: Destroy the windows after we've used them.
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: 9d449ab4895a32aec25be03f0ead30debf34b6c8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9d449ab4895a32aec25be03… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Thu Jun 22 15:01:25 2006 +0200 uxtheme/tests: Destroy the windows after we've used them. --- dlls/uxtheme/tests/system.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 5375afe..9a1c558 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -104,6 +104,7 @@ static void test_GetWindowTheme(void) { HTHEME hTheme; HWND hWnd; + BOOL bDestroyed; SetLastError(0xdeadbeef); hTheme = pGetWindowTheme(NULL); @@ -123,12 +124,18 @@ static void test_GetWindowTheme(void) ok( GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got 0x%08lx\n", GetLastError()); + + bDestroyed = DestroyWindow(hWnd); + if (!bDestroyed) + trace("Window %p couldn't be destroyed : 0x%08lx\n", + hWnd, GetLastError()); } static void test_SetWindowTheme(void) { HRESULT hRes; HWND hWnd; + BOOL bDestroyed; SetLastError(0xdeadbeef); hRes = pSetWindowTheme(NULL, NULL, NULL); @@ -150,6 +157,11 @@ static void test_SetWindowTheme(void) ok( GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got 0x%08lx\n", GetLastError()); + + bDestroyed = DestroyWindow(hWnd); + if (!bDestroyed) + trace("Window %p couldn't be destroyed : 0x%08lx\n", + hWnd, GetLastError()); } static void test_OpenThemeData(void) @@ -157,6 +169,7 @@ static void test_OpenThemeData(void) HTHEME hTheme; HWND hWnd; BOOL bThemeActive; + BOOL bDestroyed; WCHAR szInvalidClassList[] = {'D','E','A','D','B','E','E','F', 0 }; WCHAR szButtonClassList[] = {'B','u','t','t','o','n', 0 }; @@ -222,7 +235,6 @@ static void test_OpenThemeData(void) "Expected GLE() to be E_PROP_ID_UNSUPPORTED, got 0x%08lx\n", GetLastError()); - if (!bThemeActive) { SetLastError(0xdeadbeef); @@ -262,6 +274,11 @@ static void test_OpenThemeData(void) ok( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08lx\n", GetLastError()); + + bDestroyed = DestroyWindow(hWnd); + if (!bDestroyed) + trace("Window %p couldn't be destroyed : 0x%08lx\n", + hWnd, GetLastError()); } static void test_CloseThemeData(void)

1 0