February 2012 - Wine-Commits

Jacek Caban : ieframe: Added IProvideClassInfo::GetClassInfo implementation .
by Alexandre Julliard Feb. 11, 2012

Feb. 11, 2012

Module: wine Branch: master Commit: c6a8e9a5b8e4bf5327034025a430853cf46d1988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a8e9a5b8e4bf5327034025a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 10 12:36:53 2012 +0100 ieframe: Added IProvideClassInfo::GetClassInfo implementation. --- dlls/ieframe/classinfo.c | 14 +++++++++++--- dlls/ieframe/ieframe.h | 4 ++++ dlls/ieframe/ieframe_main.c | 2 ++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/ieframe/classinfo.c b/dlls/ieframe/classinfo.c index 30b8871..72798d6 100644 --- a/dlls/ieframe/classinfo.c +++ b/dlls/ieframe/classinfo.c @@ -52,11 +52,19 @@ static ULONG WINAPI ProvideClassInfo_Release(IProvideClassInfo2 *iface) return IWebBrowser_Release(&This->IWebBrowser2_iface); } -static HRESULT WINAPI ProvideClassInfo_GetClassInfo(IProvideClassInfo2 *iface, LPTYPEINFO *ppTI) +static HRESULT WINAPI ProvideClassInfo_GetClassInfo(IProvideClassInfo2 *iface, ITypeInfo **ppTI) { WebBrowser *This = impl_from_IProvideClassInfo2(iface); - FIXME("(%p)->(%p)\n", This, ppTI); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, ppTI); + + hres = get_typeinfo(This->version > 1 ? WebBrowser_tid : WebBrowser_V1_tid, ppTI); + if(FAILED(hres)) + return hres; + + ITypeInfo_AddRef(*ppTI); + return S_OK; } static HRESULT WINAPI ProvideClassInfo_GetGUID(IProvideClassInfo2 *iface, diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index ac3e34d..ae787a9 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -284,12 +284,16 @@ void register_iewindow_class(void) DECLSPEC_HIDDEN; void unregister_iewindow_class(void) DECLSPEC_HIDDEN; #define TID_LIST \ + XCLSID(WebBrowser) \ + XCLSID(WebBrowser_V1) \ XIID(IWebBrowser2) typedef enum { #define XIID(iface) iface ## _tid, +#define XCLSID(class) class ## _tid, TID_LIST #undef XIID +#undef XCLSID LAST_tid } tid_t; diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c index cbdff92..56cd663 100644 --- a/dlls/ieframe/ieframe_main.c +++ b/dlls/ieframe/ieframe_main.c @@ -59,8 +59,10 @@ static ITypeInfo *typeinfos[LAST_tid]; static REFIID tid_ids[] = { #define XIID(iface) &IID_ ## iface, +#define XCLSID(class) &CLSID_ ## class, TID_LIST #undef XIID +#undef XCLSID }; static HRESULT load_typelib(void)

1 0

Jacek Caban : urlmon: Added empty hash URIs comparing tests.
by Alexandre Julliard Feb. 11, 2012

Feb. 11, 2012

Module: wine Branch: master Commit: 096eeb1a1eff3ff9f46d607a63f92102f1604dc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=096eeb1a1eff3ff9f46d607a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 10 11:12:37 2012 +0100 urlmon: Added empty hash URIs comparing tests. --- dlls/urlmon/tests/uri.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 3d140ca..40c8a76 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4691,6 +4691,22 @@ static const uri_equality equality_tests[] = { "file:///c:/dir/file.txt#a", 0, "file:///c:\\dir\\file.txt#b", Uri_CREATE_FILE_USE_DOS_PATH, FALSE + }, + /* Tests of an empty hash/fragment part */ + { + "http://google.com/test",0, + "http://google.com/test#",0, + FALSE + }, + { + "ftp://ftp.winehq.org/",0, + "ftp://ftp.winehq.org/#",0, + FALSE + }, + { + "file:///c:/dir/file.txt#", 0, + "file:///c:\\dir\\file.txt", Uri_CREATE_FILE_USE_DOS_PATH, + FALSE } };

1 0

Alistair Leslie-Hughes : mshtml/tests: Interface ITravelLogClient may not be supported.
by Alexandre Julliard Feb. 9, 2012

Feb. 9, 2012

Module: wine Branch: master Commit: 4d962da7b06cd1d3460a8d58b9f7cda799989bfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d962da7b06cd1d3460a8d58b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 5 15:45:22 2012 +1100 mshtml/tests: Interface ITravelLogClient may not be supported. --- dlls/mshtml/tests/dom.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8df47cc..674d0a3 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -254,7 +254,6 @@ static const IID * const window_iids[] = { &IID_IHTMLWindow3, &IID_IDispatchEx, &IID_IServiceProvider, - &IID_ITravelLogClient, NULL }; @@ -4419,6 +4418,12 @@ static void test_window(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_parentWindow(doc, &window); ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); test_ifaces((IUnknown*)window, window_iids); + hres = IDispatch_QueryInterface(window, &IID_ITravelLogClient, (void**)&unk); + if(hres == S_OK) + IUnknown_Release(unk); + else + win_skip("IID_ITravelLogClient not supported\n"); + test_disp((IUnknown*)window, &DIID_DispHTMLWindow2, "[object]"); hres = IHTMLWindow2_get_document(window, &doc2);

1 0

Aric Stewart : gdi32: Load fonts from default Mac external font paths.
by Alexandre Julliard Feb. 9, 2012

Feb. 9, 2012

Module: wine Branch: master Commit: 85a71387dac1ca3ad47970800c8c01743681b528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85a71387dac1ca3ad47970800… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 9 09:57:03 2012 -0600 gdi32: Load fonts from default Mac external font paths. --- dlls/gdi32/freetype.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5e6a952..8bf397b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3120,6 +3120,7 @@ static void init_font_list(void) DWORD valuelen, datalen, i = 0, type, dlen, vlen; WCHAR windowsdir[MAX_PATH]; char *unixname; + const char *home; const char *data_dir; delete_external_font_keys(); @@ -3225,7 +3226,6 @@ static void init_font_list(void) ptr = valueA; while (ptr) { - const char* home; LPSTR next = strchr( ptr, ':' ); if (next) *next++ = 0; if (ptr[0] == '~' && ptr[1] == '/' && (home = getenv( "HOME" )) && @@ -3246,6 +3246,21 @@ static void init_font_list(void) } RegCloseKey(hkey); } + +#ifdef __APPLE__ + /* Mac default font locations. */ + ReadFontDir( "/Library/Fonts", TRUE ); + ReadFontDir( "/Network/Library/Fonts", TRUE ); + ReadFontDir( "/System/Library/Fonts", TRUE ); + if ((home = getenv( "HOME" ))) + { + unixname = HeapAlloc( GetProcessHeap(), 0, strlen(home)+15 ); + strcpy( unixname, home ); + strcat( unixname, "/Library/Fonts" ); + ReadFontDir( unixname, TRUE); + HeapFree( GetProcessHeap(), 0, unixname ); + } +#endif } static BOOL move_to_front(const WCHAR *name)

1 0

Akihiro Sagawa : gdi32/tests: Reorder tests to avoid side-effects.
by Alexandre Julliard Feb. 9, 2012

Feb. 9, 2012

Module: wine Branch: master Commit: 39f748f083d3c311e288a6ee8630f42426c830dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f748f083d3c311e288a6ee8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Feb 10 01:39:27 2012 +0900 gdi32/tests: Reorder tests to avoid side-effects. --- dlls/gdi32/tests/font.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 307493b..d004cf4 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4275,11 +4275,11 @@ START_TEST(font) test_CreateFontIndirectEx(); test_oemcharset(); test_fullname(); - - test_vertical_font(); test_east_asian_font_selection(); - /* CreateScalableFontResource should be last test until RemoveFontResource + + /* These tests should be last test until RemoveFontResource * is properly implemented. */ + test_vertical_font(); test_CreateScalableFontResource(); }

1 0

Erich Hoover : hhctrl.ocx: Fix searching for Index and TOC file.
by Alexandre Julliard Feb. 9, 2012

Feb. 9, 2012

Module: wine Branch: master Commit: 4c908dd8dae7092734be67514d3aec1c79096f9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c908dd8dae7092734be67514… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Feb 3 14:28:47 2012 -0700 hhctrl.ocx: Fix searching for Index and TOC file. --- dlls/hhctrl.ocx/chm.c | 59 ++++++++++++++++++++++++++++++++++++++------- dlls/hhctrl.ocx/hhctrl.h | 1 + 2 files changed, 50 insertions(+), 10 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 51d1685..e6f955d 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -138,6 +138,8 @@ static BOOL ReadChmSystem(CHMInfo *chm) break; case 0x6: TRACE("Compiled file is %s\n", debugstr_an(buf, entry.len)); + heap_free(chm->compiledFile); + chm->compiledFile = strdupnAtoW(buf, entry.len); break; case 0x9: TRACE("Version is %s\n", debugstr_an(buf, entry.len)); @@ -209,6 +211,32 @@ LPWSTR FindContextAlias(CHMInfo *chm, DWORD index) return strdupAtoW(ret); } +/* + * Tests if the file <chmfile>.<ext> exists, used for loading Indicies, Table of Contents, etc. + * when these files are not available from the HH_WINTYPE structure. + */ +static WCHAR *FindHTMLHelpSetting(HHInfo *info, const WCHAR *extW) +{ + static const WCHAR periodW[] = {'.',0}; + IStorage *pStorage = info->pCHMInfo->pStorage; + IStream *pStream; + WCHAR *filename; + HRESULT hr; + + filename = heap_alloc(strlenW(info->pCHMInfo->compiledFile)+strlenW(periodW)+strlenW(extW)+1); + strcpyW(filename, info->pCHMInfo->compiledFile); + strcatW(filename, periodW); + strcatW(filename, extW); + hr = IStorage_OpenStream(pStorage, filename, NULL, STGM_READ, 0, &pStream); + if (FAILED(hr)) + { + heap_free(filename); + return strdupAtoW(""); + } + IStream_Release(pStream); + return filename; +} + /* Loads the HH_WINTYPE data from the CHM file * * FIXME: There may be more than one window type in the file, so @@ -222,6 +250,8 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) HRESULT hr; DWORD cbRead; + static const WCHAR toc_extW[] = {'h','h','c',0}; + static const WCHAR index_extW[] = {'h','h','k',0}; static const WCHAR windowsW[] = {'#','W','I','N','D','O','W','S',0}; hr = IStorage_OpenStream(pStorage, windowsW, NULL, STGM_READ, 0, &pStream); @@ -258,16 +288,24 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) if (FAILED(hr)) goto done; /* convert the #STRINGS offsets to actual strings */ - info->WinType.pszType = info->pszType = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszType)); - info->WinType.pszCaption = info->pszCaption = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszCaption)); - info->WinType.pszToc = info->pszToc = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszToc)); - info->WinType.pszIndex = info->pszIndex = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszIndex)); - info->WinType.pszFile = info->pszFile = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszFile)); - info->WinType.pszHome = info->pszHome = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszHome)); - info->WinType.pszJump1 = info->pszJump1 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszJump1)); - info->WinType.pszJump2 = info->pszJump2 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszJump2)); - info->WinType.pszUrlJump1 = info->pszUrlJump1 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszUrlJump1)); - info->WinType.pszUrlJump2 = info->pszUrlJump2 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszUrlJump2)); + + info->WinType.pszType = info->pszType = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszType)); + info->WinType.pszCaption = info->pszCaption = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszCaption)); + info->WinType.pszFile = info->pszFile = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszFile)); + info->WinType.pszHome = info->pszHome = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszHome)); + info->WinType.pszJump1 = info->pszJump1 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszJump1)); + info->WinType.pszJump2 = info->pszJump2 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszJump2)); + info->WinType.pszUrlJump1 = info->pszUrlJump1 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszUrlJump1)); + info->WinType.pszUrlJump2 = info->pszUrlJump2 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszUrlJump2)); + + if (info->WinType.pszToc) + info->WinType.pszToc = info->pszToc = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszToc)); + else + info->WinType.pszToc = info->pszToc = FindHTMLHelpSetting(info, toc_extW); + if (info->WinType.pszIndex) + info->WinType.pszIndex = info->pszIndex = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszIndex)); + else + info->WinType.pszIndex = info->pszIndex = FindHTMLHelpSetting(info, index_extW); /* FIXME: pszCustomTabs is a list of multiple zero-terminated strings so ReadString won't * work in this case @@ -431,6 +469,7 @@ CHMInfo *CloseCHM(CHMInfo *chm) heap_free(chm->defTopic); heap_free(chm->defToc); heap_free(chm->szFile); + heap_free(chm->compiledFile); heap_free(chm); return NULL; diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 3e496f9..cbbcb70 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -102,6 +102,7 @@ typedef struct CHMInfo char **strings; DWORD strings_size; + WCHAR *compiledFile; WCHAR *defTopic; WCHAR *defTitle; WCHAR *defToc;

1 0

Jacek Caban : urlmon: Added more mk: combining tests.
by Alexandre Julliard Feb. 9, 2012

Feb. 9, 2012

Module: wine Branch: master Commit: 2ce15be5fad42667ed81a02fbf2ba7285050768c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce15be5fad42667ed81a02fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 9 15:16:51 2012 +0100 urlmon: Added more mk: combining tests. --- dlls/urlmon/tests/uri.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 162 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 4b0e788..3d140ca 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -6695,6 +6695,168 @@ static const uri_combine_test uri_combine_tests[] = { {URLZONE_INVALID,E_NOTIMPL} } }, + { "mk:@MSITSTORE:C:\\dir\\file.chm::/subdir/file.txt",0, + "/relative/path.txt",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"mk:@MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"@MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK}, + {"@MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK}, + {"mk",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MK,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "mk:MSITSTORE:C:\\dir\\file.chm::/subdir/file.txt",0, + "/relative/path.txt",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"mk:MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK}, + {"MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:MSITSTORE:C:\\dir\\file.chm::/relative/path.txt",S_OK}, + {"mk",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MK,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "mk:@MSITSTORE:C:\\dir\\file.chm::/subdir/../../file.txt",0, + "/relative/path.txt",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"mk:@MSITSTORE:/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:/relative/path.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"@MSITSTORE:/relative/path.txt",S_OK}, + {"@MSITSTORE:/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:/relative/path.txt",S_OK}, + {"mk",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MK,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "mk:@xxx:C:\\dir\\file.chm::/subdir/../../file.txt",0, + "/relative/path.txt",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"mk:@xxx:/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@xxx:/relative/path.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"@xxx:/relative/path.txt",S_OK}, + {"@xxx:/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@xxx:/relative/path.txt",S_OK}, + {"mk",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MK,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "mk:xxx:C:\\dir\\file.chm::/subdir/../../file.txt",0, + "/relative/path.txt",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"mk:/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:/relative/path.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"/relative/path.txt",S_OK}, + {"/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:/relative/path.txt",S_OK}, + {"mk",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MK,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "ml:@MSITSTORE:C:\\dir\\file.chm::/subdir/file.txt",0, + "/relative/path.txt",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"ml:/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"ml:/relative/path.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"/relative/path.txt",S_OK}, + {"/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"ml:/relative/path.txt",S_OK}, + {"ml",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_UNKNOWN,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, { "http://winehq.org/dir/test?querystring",0, "//winehq.com/#hash",Uri_CREATE_ALLOW_RELATIVE, 0,S_OK,FALSE,

1 0

Jacek Caban : t2embapi.h: Added some missing declarations.
by Alexandre Julliard Feb. 9, 2012

Feb. 9, 2012

Module: wine Branch: master Commit: 846c0e365d864e62ac926a006a425a8f543128f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=846c0e365d864e62ac926a006… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 7 16:00:05 2012 +0100 t2embapi.h: Added some missing declarations. --- include/t2embapi.h | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/include/t2embapi.h b/include/t2embapi.h index b07359e..16d68f3 100644 --- a/include/t2embapi.h +++ b/include/t2embapi.h @@ -23,6 +23,19 @@ extern "C" { #endif +#define CHARSET_UNICODE 1 +#define CHARSET_DEFAULT 1 +#define CHARSET_SYMBOL 2 +#define CHARSET_GLYPHIDX 3 + +#define LICENSE_INSTALLABLE 0x0000 +#define LICENSE_DEFAULT 0x0000 +#define LICENSE_NOEMBEDDING 0x0002 +#define LICENSE_PREVIEWPRINT 0x0004 +#define LICENSE_EDITABLE 0x0008 + +#define TTLOAD_PRIVATE 0x0001 + /* Possible return values. */ #define E_NONE __MSABI_LONG(0x0000) #define E_API_NOTIMPL __MSABI_LONG(0x0001) @@ -46,6 +59,7 @@ typedef struct LONG WINAPI TTLoadEmbeddedFont(HANDLE*,ULONG,ULONG*,ULONG,ULONG*,READEMBEDPROC, LPVOID,LPWSTR,LPSTR,TTLOADINFO*); +LONG WINAPI TTDeleteEmbeddedFont(HANDLE,ULONG,ULONG*); /* embedding privileges */ #define EMBED_PREVIEWPRINT 1

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard Feb. 9, 2012

Feb. 9, 2012

Module: wine Branch: master Commit: b0bc037d36e7fa83e9d5395dd916daee1a96e375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0bc037d36e7fa83e9d5395dd… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Feb 9 21:15:19 2012 +0900 po: Update Korean translation. --- po/ko.po | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/po/ko.po b/po/ko.po index c9affcd..7c58a75 100644 --- a/po/ko.po +++ b/po/ko.po @@ -9191,7 +9191,6 @@ msgid "&Always on Top" msgstr "항상 앞에 (&A)" #: clock.rc:42 -#, fuzzy msgid "&About Clock" msgstr "시계 정보(&A)"

1 0

Austin English : advapi32: Sync specfile to win7.
by Alexandre Julliard Feb. 9, 2012

Feb. 9, 2012

Module: wine Branch: master Commit: 797a6ae066d2faf7558bacafe14be76ae3746938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=797a6ae066d2faf7558bacafe… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 3 21:50:48 2012 -0600 advapi32: Sync specfile to win7. --- dlls/advapi32/advapi32.spec | 133 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 133 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=797a6ae066d2faf7558ba…

1 0

Nikolay Sivov : comctl32: A test for auto-set TBSTYLE_TRANSPARENT style.
by Alexandre Julliard Feb. 9, 2012

Feb. 9, 2012

Module: wine Branch: master Commit: e630e4997d8f704bc75fe29e6804c10e388bbb66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e630e4997d8f704bc75fe29e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 9 08:54:59 2012 +0300 comctl32: A test for auto-set TBSTYLE_TRANSPARENT style. --- dlls/comctl32/tests/toolbar.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index f1579b7..386511a 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1825,6 +1825,19 @@ static void test_create(void) DestroyWindow(hwnd); UnhookWindowsHook(WH_CBT, cbt_hook_proc); + + /* TBSTYLE_TRANSPARENT */ + hwnd = CreateWindowExA(0, TOOLBARCLASSNAME, NULL, + WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|TBSTYLE_FLAT|TBSTYLE_TOOLTIPS|TBSTYLE_GROUP, + 0, 0, 0, 0, hMainWnd, (HMENU)5, GetModuleHandle(NULL), NULL); + + style = GetWindowLongA(hwnd, GWL_STYLE); + ok((style & TBSTYLE_TRANSPARENT) == TBSTYLE_TRANSPARENT, "got 0x%08x\n", style); + + style = SendMessageA(hwnd, TB_GETSTYLE, 0, 0); + ok((style & TBSTYLE_TRANSPARENT) == TBSTYLE_TRANSPARENT, "got 0x%08x\n", style); + + DestroyWindow(hwnd); } START_TEST(toolbar)

1 0

Jacek Caban : urlmon: Properly handle combining relative mk: URIs containing full internal path.
by Alexandre Julliard Feb. 9, 2012

Feb. 9, 2012

Module: wine Branch: master Commit: 9cbcbe8da69698b01b4e276715f8f8f317cb07f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cbcbe8da69698b01b4e27671… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 9 15:16:38 2012 +0100 urlmon: Properly handle combining relative mk: URIs containing full internal path. --- dlls/urlmon/uri.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 2710c7c..3d6bf8b 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6389,13 +6389,25 @@ static HRESULT merge_paths(parse_data *data, const WCHAR *base, DWORD base_len, WCHAR *ptr; if(base_len) { - /* Find the characters that will be copied over from - * the base path. - */ - end = memrchrW(base, '/', base_len); - if(!end && data->scheme_type == URL_SCHEME_FILE) - /* Try looking for a '\\'. */ - end = memrchrW(base, '\\', base_len); + if(data->scheme_type == URL_SCHEME_MK && *relative == '/') { + /* Find '::' segment */ + for(end = base; end < base+base_len-1; end++) { + if(end[0] == ':' && end[1] == ':') { + end++; + break; + } + } + + /* If not found, try finding the end of @xxx: */ + if(end == base+base_len-1) + end = *base == '@' ? memchr(base, ':', base_len) : NULL; + }else { + /* Find the characters that will be copied over from the base path. */ + end = memrchrW(base, '/', base_len); + if(!end && data->scheme_type == URL_SCHEME_FILE) + /* Try looking for a '\\'. */ + end = memrchrW(base, '\\', base_len); + } } if(end) { @@ -6420,6 +6432,7 @@ static HRESULT merge_paths(parse_data *data, const WCHAR *base, DWORD base_len, *ptr = '\0'; *result_len = (ptr-*result); + TRACE("ret %s\n", debugstr_wn(*result, *result_len)); return S_OK; } @@ -6541,7 +6554,7 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result, * relative path doesn't begin with a '/' then the base path and relative * path are merged together. */ - if(relative->path_len && *(relative->canon_uri+relative->path_start) == '/') { + if(relative->path_len && *(relative->canon_uri+relative->path_start) == '/' && data.scheme_type != URL_SCHEME_MK) { WCHAR *tmp = NULL; BOOL copy_drive_path = FALSE;

1 0

Christian Costa : d3dx9_36: Turn FIXME into TRACE since function is implemented. Not supported formats are caught by final FIXME.
by Alexandre Julliard Feb. 9, 2012

Feb. 9, 2012

Module: wine Branch: master Commit: 17b18218254cdd52f4e40ca6bd0f50777293d576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17b18218254cdd52f4e40ca6b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Feb 9 01:09:32 2012 +0100 d3dx9_36: Turn FIXME into TRACE since function is implemented. Not supported formats are caught by final FIXME. --- dlls/d3dx9_36/surface.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index c3796ee..8049efc 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -59,10 +59,8 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D IWICStream *stream; HRESULT hr; HRESULT initresult; - static int warn_once; - if (!warn_once++) - FIXME("(%p, %d, %p): partially implemented\n", data, datasize, info); + TRACE("(%p, %d, %p)\n", data, datasize, info); /* TODO: Add support for (or at least detect) DDS, PPM and DIB */

1 0

Huw Davies : gdi32: Intersect the background text box with the clip rectangle in device units.
by Alexandre Julliard Feb. 9, 2012

Feb. 9, 2012

Module: wine Branch: master Commit: d3bfa44d53fc2afef2dd5d9bec017d8f0ebd9f7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3bfa44d53fc2afef2dd5d9be… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 9 11:19:02 2012 +0000 gdi32: Intersect the background text box with the clip rectangle in device units. --- dlls/gdi32/font.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 03314a8..e17dd44 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2346,14 +2346,8 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, text_box.top = y - tm.tmAscent; text_box.bottom = y + tm.tmDescent; - if(flags & ETO_CLIPPED) - { - text_box.left = max(lprect->left, text_box.left); - text_box.right = min(lprect->right, text_box.right); - text_box.top = max(lprect->top, text_box.top); - text_box.bottom = min(lprect->bottom, text_box.bottom); - } - if(text_box.left < text_box.right && text_box.top < text_box.bottom) + if (flags & ETO_CLIPPED) intersect_rect( &text_box, &text_box, &rc ); + if (!is_rect_empty( &text_box )) physdev->funcs->pExtTextOut( physdev, 0, 0, ETO_OPAQUE, &text_box, NULL, 0, NULL ); } }

1 0

Austin English : wine.inf: Add CurrentControlSet\Control\VirtualDeviceDrivers registry key.
by Alexandre Julliard Feb. 9, 2012

Feb. 9, 2012

Module: wine Branch: master Commit: 1235b0151800ecaa8bff1db4cee19cba4006af16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1235b0151800ecaa8bff1db4c… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 8 15:23:07 2012 -0800 wine.inf: Add CurrentControlSet\Control\VirtualDeviceDrivers registry key. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 3ea3025..14e9245 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -691,6 +691,7 @@ HKLM,Software\Microsoft\Transaction Server,,16 HKLM,Software\Policies,,16 HKLM,Software\Registered Applications,,16 HKLM,System\CurrentControlSet\Control\Lsa,,16 +HKLM,System\CurrentControlSet\Control\VirtualDeviceDrivers,,16 HKLM,System\CurrentControlSet\Control\VMM32Files,,16 HKCU,AppEvents\Schemes\Apps\Explorer\Navigating\.Current,,,"" HKCU,Software\Microsoft\Protected Storage System Provider,,16

1 0

Jörg Höhle : mmdevapi/tests: Fix errors and crashes in various native configurations.
by Alexandre Julliard Feb. 9, 2012

Feb. 9, 2012

Module: wine Branch: master Commit: ac8360b3bfc081d50b23e2a4b6ea68f4027c7fab URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac8360b3bfc081d50b23e2a4b… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jan 25 19:14:06 2012 +0100 mmdevapi/tests: Fix errors and crashes in various native configurations. --- dlls/mmdevapi/tests/render.c | 103 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 84 insertions(+), 19 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 928d93e..df0d177 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -237,8 +237,8 @@ static void test_audioclient(void) hexcl = S_OK; hr = IAudioClient_IsFormatSupported(ac, 0xffffffff, pwfx, NULL); - ok(hr == E_INVALIDARG || - hr == AUDCLNT_E_UNSUPPORTED_FORMAT, + ok(hr == E_INVALIDARG/*w32*/ || + broken(hr == AUDCLNT_E_UNSUPPORTED_FORMAT/*w64 response from exclusive mode driver */), "IsFormatSupported(0xffffffff) call returns %08x\n", hr); } @@ -250,7 +250,7 @@ static void test_audioclient(void) hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0xffffffff, 5000000, 0, pwfx, NULL); ok(hr == E_INVALIDARG, "Initialize with invalid flags returns %08x\n", hr); - /* It seems that if length > 2s or periodicity != 0 the length is ignored and call succeeds + /* A period != 0 is ignored and the call succeeds. * Since we can only initialize successfully once, skip those tests. */ hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, NULL, NULL); @@ -430,8 +430,9 @@ static void test_formats(AUDCLNT_SHAREMODE mode) /* Vista returns E_INVALIDARG upon AUDCLNT_STREAMFLAGS_RATEADJUST */ hr = IAudioClient_Initialize(ac, mode, 0, 5000000, 0, &fmt, NULL); if ((hrs == S_OK) ^ (hr == S_OK)) - trace("Initialize (%u , %ux%2ux%u) returns %08x unlike IsFormatSupported\n", - mode, fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); + trace("Initialize (%s, %ux%2ux%u) returns %08x unlike IsFormatSupported\n", + mode == AUDCLNT_SHAREMODE_SHARED ? "shared " : "exclus.", + fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); if (mode == AUDCLNT_SHAREMODE_SHARED) ok(hrs == S_OK ? hr == S_OK : hr == AUDCLNT_E_UNSUPPORTED_FORMAT, "Initialize(shared, %ux%2ux%u) returns %08x\n", @@ -443,10 +444,12 @@ static void test_formats(AUDCLNT_SHAREMODE mode) fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr, hrs); else /* On testbot 48000x16x1 claims support, but does not Initialize. - * Some cards Initialize 44100|48000x16x1 yet claim no support. */ + * Some cards Initialize 44100|48000x16x1 yet claim no support; + * F. Gouget's w7 bots do that for 12000|96000x8|16x1|2 */ ok(hrs == S_OK ? hr == S_OK || broken(hr == AUDCLNT_E_ENDPOINT_CREATE_FAILED) : hr == AUDCLNT_E_ENDPOINT_CREATE_FAILED || broken(hr == S_OK && - fmt.nChannels == 1 && pwfx->wBitsPerSample == fmt.wBitsPerSample), + ((fmt.nChannels == 1 && fmt.wBitsPerSample == 16) || + (fmt.nSamplesPerSec == 12000 || fmt.nSamplesPerSec == 96000))), "Initialize(exclus., %ux%2ux%u) returns %08x\n", fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); @@ -599,6 +602,7 @@ static void test_event(void) { HANDLE event; HRESULT hr; + DWORD r; IAudioClient *ac; WAVEFORMATEX *pwfx; @@ -627,12 +631,41 @@ static void test_event(void) hr = IAudioClient_SetEventHandle(ac, event); ok(hr == S_OK, "SetEventHandle failed: %08x\n", hr); + hr = IAudioClient_SetEventHandle(ac, event); + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "SetEventHandle returns %08x\n", hr); + + r = WaitForSingleObject(event, 40); + ok(r == WAIT_TIMEOUT, "Wait(event) before Start gave %x\n", r); + hr = IAudioClient_Start(ac); ok(hr == S_OK, "Start failed: %08x\n", hr); + r = WaitForSingleObject(event, 20); + ok(r == WAIT_OBJECT_0, "Wait(event) after Start gave %x\n", r); + hr = IAudioClient_Stop(ac); ok(hr == S_OK, "Stop failed: %08x\n", hr); + ok(ResetEvent(event), "ResetEvent\n"); + + /* Still receiving events! */ + r = WaitForSingleObject(event, 20); + todo_wine ok(r == WAIT_OBJECT_0, "Wait(event) after Stop gave %x\n", r); + + hr = IAudioClient_Reset(ac); + ok(hr == S_OK, "Reset failed: %08x\n", hr); + + ok(ResetEvent(event), "ResetEvent\n"); + + r = WaitForSingleObject(event, 120); + todo_wine ok(r == WAIT_OBJECT_0, "Wait(event) after Reset gave %x\n", r); + + hr = IAudioClient_SetEventHandle(ac, NULL); + ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08x\n", hr); + + r = WaitForSingleObject(event, 70); + todo_wine ok(r == WAIT_OBJECT_0, "Wait(NULL event) gave %x\n", r); + /* test releasing a playing stream */ hr = IAudioClient_Start(ac); ok(hr == S_OK, "Start failed: %08x\n", hr); @@ -889,14 +922,17 @@ static void test_session(void) 0, 5000000, 0, pwfx, &ses1_guid); ok(hr == S_OK, "Initialize failed: %08x\n", hr); - hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, - NULL, (void**)&ses1_ac2); - ok(hr == S_OK, "Activation failed with %08x\n", hr); - if(FAILED(hr)){ + if(hr == S_OK){ + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ses1_ac2); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + } + if(hr != S_OK){ skip("Unable to open the same device twice. Skipping session tests\n"); ref = IAudioClient_Release(ses1_ac1); ok(ref == 0, "AudioClient wasn't released: %u\n", ref); + CoTaskMemFree(pwfx); return; } @@ -1076,8 +1112,15 @@ static void test_streamvolume(void) 0, fmt, NULL); ok(hr == S_OK, "Initialize failed: %08x\n", hr); - hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + if(hr == S_OK){ + hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); + ok(hr == S_OK, "GetService failed: %08x\n", hr); + } + if(hr != S_OK){ + IAudioClient_Release(ac); + CoTaskMemFree(fmt); + return; + } hr = IAudioStreamVolume_GetChannelCount(asv, NULL); ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08x\n", hr); @@ -1173,8 +1216,15 @@ static void test_channelvolume(void) AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, NULL); ok(hr == S_OK, "Initialize failed: %08x\n", hr); - hr = IAudioClient_GetService(ac, &IID_IChannelAudioVolume, (void**)&acv); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + if(hr == S_OK){ + hr = IAudioClient_GetService(ac, &IID_IChannelAudioVolume, (void**)&acv); + ok(hr == S_OK, "GetService failed: %08x\n", hr); + } + if(hr != S_OK){ + IAudioClient_Release(ac); + CoTaskMemFree(fmt); + return; + } hr = IChannelAudioVolume_GetChannelCount(acv, NULL); ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08x\n", hr); @@ -1273,8 +1323,15 @@ static void test_simplevolume(void) AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, NULL); ok(hr == S_OK, "Initialize failed: %08x\n", hr); - hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + if(hr == S_OK){ + hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); + ok(hr == S_OK, "GetService failed: %08x\n", hr); + } + if(hr != S_OK){ + IAudioClient_Release(ac); + CoTaskMemFree(fmt); + return; + } hr = ISimpleAudioVolume_GetMasterVolume(sav, NULL); ok(hr == NULL_PTR_ERR, "GetMasterVolume gave wrong error: %08x\n", hr); @@ -1360,8 +1417,15 @@ static void test_volume_dependence(void) AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, &session); ok(hr == S_OK, "Initialize failed: %08x\n", hr); - hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); - ok(hr == S_OK, "GetService (SimpleAudioVolume) failed: %08x\n", hr); + if(hr == S_OK){ + hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); + ok(hr == S_OK, "GetService (SimpleAudioVolume) failed: %08x\n", hr); + } + if(hr != S_OK){ + IAudioClient_Release(ac); + CoTaskMemFree(fmt); + return; + } hr = IAudioClient_GetService(ac, &IID_IChannelAudioVolume, (void**)&cav); ok(hr == S_OK, "GetService (ChannelAudioVolme) failed: %08x\n", hr); @@ -1678,6 +1742,7 @@ static void test_worst_case(void) CoTaskMemFree(pwfx); IAudioClient_Release(ac); + IAudioClock_Release(acl); IAudioRenderClient_Release(arc); }

1 0

Huw Davies : gdi32: Rename a shadow variable.
by Alexandre Julliard Feb. 9, 2012

Feb. 9, 2012

Module: wine Branch: master Commit: 1eca24bd6bd7598b9d6b039b81fc4b31b72e119a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eca24bd6bd7598b9d6b039b8… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 9 11:19:01 2012 +0000 gdi32: Rename a shadow variable. --- dlls/gdi32/font.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 71e0857..03314a8 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2340,21 +2340,21 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, if(!(flags & ETO_OPAQUE) || x < rc.left || x + width.x >= rc.right || y - tm.tmAscent < rc.top || y + tm.tmDescent >= rc.bottom) { - RECT rc; - rc.left = x; - rc.right = x + width.x; - rc.top = y - tm.tmAscent; - rc.bottom = y + tm.tmDescent; + RECT text_box; + text_box.left = x; + text_box.right = x + width.x; + text_box.top = y - tm.tmAscent; + text_box.bottom = y + tm.tmDescent; if(flags & ETO_CLIPPED) { - rc.left = max(lprect->left, rc.left); - rc.right = min(lprect->right, rc.right); - rc.top = max(lprect->top, rc.top); - rc.bottom = min(lprect->bottom, rc.bottom); + text_box.left = max(lprect->left, text_box.left); + text_box.right = min(lprect->right, text_box.right); + text_box.top = max(lprect->top, text_box.top); + text_box.bottom = min(lprect->bottom, text_box.bottom); } - if(rc.left < rc.right && rc.top < rc.bottom) - physdev->funcs->pExtTextOut( physdev, 0, 0, ETO_OPAQUE, &rc, NULL, 0, NULL ); + if(text_box.left < text_box.right && text_box.top < text_box.bottom) + physdev->funcs->pExtTextOut( physdev, 0, 0, ETO_OPAQUE, &text_box, NULL, 0, NULL ); } } }

1 0

Christian Costa : include: Add missing formats in D3DXIMAGE_FILEFORMAT enum .
by Alexandre Julliard Feb. 9, 2012

Feb. 9, 2012

Module: wine Branch: master Commit: f36f49fae3ab2b5a57e29f9e23526becb9d17f2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f36f49fae3ab2b5a57e29f9e2… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Feb 8 19:19:36 2012 +0100 include: Add missing formats in D3DXIMAGE_FILEFORMAT enum. --- include/d3dx9tex.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/d3dx9tex.h b/include/d3dx9tex.h index 8e553e0..0f8fe68 100644 --- a/include/d3dx9tex.h +++ b/include/d3dx9tex.h @@ -52,7 +52,7 @@ #define D3DX_CHANNEL_LUMINANCE 0x00000010 /********************************************** - **************** Typedefs **************** + ****************** Typedefs ****************** **********************************************/ typedef enum _D3DXIMAGE_FILEFORMAT { @@ -63,6 +63,8 @@ typedef enum _D3DXIMAGE_FILEFORMAT D3DXIFF_DDS, D3DXIFF_PPM, D3DXIFF_DIB, + D3DXIFF_HDR, + D3DXIFF_PFM, D3DXIFF_FORCE_DWORD = 0x7fffffff } D3DXIMAGE_FILEFORMAT;

1 0

Jörg Höhle : mmdevapi/tests: Produce audible output.
by Alexandre Julliard Feb. 9, 2012

Feb. 9, 2012

Module: wine Branch: master Commit: f9f704879884a0eb3587b5d8be2060016f61306d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f704879884a0eb3587b5d8b… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Feb 1 06:53:31 2012 +0100 mmdevapi/tests: Produce audible output. --- dlls/mmdevapi/tests/render.c | 40 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 2427be7..928d93e 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -66,6 +66,32 @@ static inline const char *dbgstr_guid( const GUID *id ) return ret; } +#define PI 3.14159265358979323846L +static DWORD wave_generate_tone(PWAVEFORMATEX pwfx, BYTE* data, UINT32 frames) +{ + static double phase = 0.; /* normalized to unit, not 2*PI */ + PWAVEFORMATEXTENSIBLE wfxe = (PWAVEFORMATEXTENSIBLE)pwfx; + DWORD cn, i; + double delta, y; + + if(!winetest_interactive || wfxe->Format.wFormatTag != WAVE_FORMAT_EXTENSIBLE || + !IsEqualGUID(&wfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)) + return AUDCLNT_BUFFERFLAGS_SILENT; + + for(delta = phase, cn = 0; cn < wfxe->Format.nChannels; + delta += .5/wfxe->Format.nChannels, cn++){ + for(i = 0; i < frames; i++){ + y = sin(2*PI*(440.* i / wfxe->Format.nSamplesPerSec + delta)); + /* assume alignment is granted */ + ((float*)data)[cn+i*wfxe->Format.nChannels] = y; + /* fixme: 16bit for exclusive mode */ + } + } + phase += 440.* frames / wfxe->Format.nSamplesPerSec; + phase -= floor(phase); + return 0; +} + static void test_uninitialized(IAudioClient *ac) { HRESULT hr; @@ -1590,7 +1616,15 @@ static void test_worst_case(void) hr = IAudioClock_GetPosition(acl, &pos, &pcpos0); ok(hr == S_OK, "GetPosition failed: %08x\n", hr); - /* XAudio2 prefills one period, we don't */ + /* XAudio2 prefills one period, play without it */ + if(winetest_debug>2){ + hr = IAudioRenderClient_GetBuffer(arc, fragment, &data); + ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + + hr = IAudioRenderClient_ReleaseBuffer(arc, fragment, AUDCLNT_BUFFERFLAGS_SILENT); + ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + } + hr = IAudioClient_Start(ac); ok(hr == S_OK, "Start failed: %08x\n", hr); @@ -1609,8 +1643,8 @@ static void test_worst_case(void) hr = IAudioRenderClient_GetBuffer(arc, fragment, &data); ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); - /* fixme: produce audible output */ - hr = IAudioRenderClient_ReleaseBuffer(arc, fragment, AUDCLNT_BUFFERFLAGS_SILENT); + hr = IAudioRenderClient_ReleaseBuffer(arc, fragment, + wave_generate_tone(pwfx, data, fragment)); ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); if(hr == S_OK) sum += fragment;

1 0

Matteo Bruni : ddraw: Don't leak the window DC.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

Module: wine Branch: master Commit: 769fd080f88235a687c18127ed0c580d60ad630a URL: http://source.winehq.org/git/wine.git/?a=commit;h=769fd080f88235a687c18127e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 8 22:35:11 2012 +0100 ddraw: Don't leak the window DC. --- dlls/ddraw/clipper.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index 89a3bf3..db9c383 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -130,6 +130,7 @@ static HRGN get_window_region(HWND window) OffsetRgn(rgn, origin.x, origin.y); } + ReleaseDC(window, dc); return rgn; }

1 0

Frédéric Delanoy : po: Remove untranslated English strings from the Danish translation.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

Module: wine Branch: master Commit: 534f931cc7834b2a1d28ed3992116b058d66190d URL: http://source.winehq.org/git/wine.git/?a=commit;h=534f931cc7834b2a1d28ed399… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 8 18:52:18 2012 +0100 po: Remove untranslated English strings from the Danish translation. --- po/da.po | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/po/da.po b/po/da.po index fa832ee..4b2fb1c 100644 --- a/po/da.po +++ b/po/da.po @@ -484,7 +484,7 @@ msgstr "&Standardprinter" #: comdlg32.rc:223 msgid "[none]" -msgstr "[none]" +msgstr "" #: comdlg32.rc:224 msgid "Specific &Printer" @@ -608,7 +608,7 @@ msgstr "&Definer selvvalgt farve >>" #: comdlg32.rc:310 regedit.rc:223 regedit.rc:233 msgid "Find" -msgstr "Find" +msgstr "" #: comdlg32.rc:313 comdlg32.rc:332 msgid "Fi&nd What:" @@ -891,7 +891,7 @@ msgstr "Oliven" #: comdlg32.rc:121 wordpad.rc:118 msgid "Navy" -msgstr "Navy" +msgstr "" #: comdlg32.rc:122 wordpad.rc:119 msgid "Purple" @@ -4571,7 +4571,7 @@ msgstr "Service login mislykkedes\n" #: winerror.mc:1226 msgid "Service start-hang\n" -msgstr "Service start-hang\n" +msgstr "" #: winerror.mc:1231 msgid "Invalid service lock\n" @@ -6293,7 +6293,7 @@ msgstr "Kan ikke få fat i kald handle\n" #: winerror.mc:3311 msgid "Null reference pointer\n" -msgstr "Null reference pointer\n" +msgstr "" #: winerror.mc:3316 msgid "Enumeration value out of range\n" @@ -7427,7 +7427,7 @@ msgstr "Kopierer filer..." #: setupapi.rc:42 msgid "Destination:" -msgstr "Destination:" +msgstr "" #: setupapi.rc:49 msgid "Files Needed" @@ -10141,7 +10141,7 @@ msgstr "Tryk Return for at fortsætte: " #: cmd.rc:321 msgid "Wine Command Prompt" -msgstr "Wine Command Prompt" +msgstr "" #: cmd.rc:322 #, fuzzy @@ -11387,7 +11387,7 @@ msgstr "&Markeret del:" #: regedit.rc:226 msgid "Find:" -msgstr "Find:" +msgstr "" #: regedit.rc:228 msgid "Find in:" @@ -12879,7 +12879,7 @@ msgstr "Vis &advanceret" #: winecfg.rc:240 msgid "De&vice:" -msgstr "De&vice:" +msgstr "" #: winecfg.rc:242 msgid "Bro&wse..." @@ -12887,7 +12887,7 @@ msgstr "G&ennemse..." #: winecfg.rc:244 msgid "&Label:" -msgstr "&Label:" +msgstr "" #: winecfg.rc:246 msgid "S&erial:"

1 0

Frédéric Delanoy : taskmgr: Debug classes names are not translatable.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

Module: wine Branch: master Commit: d463243754a179b3a0389a09e5b91bd5f4d7b1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d463243754a179b3a0389a09e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 8 19:34:29 2012 +0100 taskmgr: Debug classes names are not translatable. --- po/ar.po | 196 +++++++++++++++++++----------------------- po/bg.po | 196 +++++++++++++++++++----------------------- po/ca.po | 196 +++++++++++++++++++----------------------- po/cs.po | 196 +++++++++++++++++++----------------------- po/da.po | 196 +++++++++++++++++++----------------------- po/de.po | 196 +++++++++++++++++++----------------------- po/el.po | 196 +++++++++++++++++++----------------------- po/en.po | 196 +++++++++++++++++++----------------------- po/en_US.po | 196 +++++++++++++++++++----------------------- po/eo.po | 196 +++++++++++++++++++----------------------- po/es.po | 201 ++++++++++++++++++++----------------------- po/fa.po | 196 +++++++++++++++++++----------------------- po/fi.po | 199 +++++++++++++++++++----------------------- po/fr.po | 196 +++++++++++++++++++----------------------- po/he.po | 196 +++++++++++++++++++----------------------- po/hi.po | 196 +++++++++++++++++++----------------------- po/hu.po | 197 +++++++++++++++++++----------------------- po/it.po | 196 +++++++++++++++++++----------------------- po/ja.po | 196 +++++++++++++++++++----------------------- po/ko.po | 196 +++++++++++++++++++----------------------- po/lt.po | 196 +++++++++++++++++++----------------------- po/ml.po | 196 +++++++++++++++++++----------------------- po/nb_NO.po | 196 +++++++++++++++++++----------------------- po/nl.po | 196 +++++++++++++++++++----------------------- po/or.po | 196 +++++++++++++++++++----------------------- po/pa.po | 196 +++++++++++++++++++----------------------- po/pl.po | 196 +++++++++++++++++++----------------------- po/pt_BR.po | 196 +++++++++++++++++++----------------------- po/pt_PT.po | 196 +++++++++++++++++++----------------------- po/rm.po | 196 +++++++++++++++++++----------------------- po/ro.po | 196 +++++++++++++++++++----------------------- po/ru.po | 196 +++++++++++++++++++----------------------- po/sk.po | 196 +++++++++++++++++++----------------------- po/sl.po | 196 +++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 197 +++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 197 +++++++++++++++++++----------------------- po/sv.po | 196 +++++++++++++++++++----------------------- po/te.po | 196 +++++++++++++++++++----------------------- po/th.po | 196 +++++++++++++++++++----------------------- po/tr.po | 196 +++++++++++++++++++----------------------- po/uk.po | 196 +++++++++++++++++++----------------------- po/wa.po | 196 +++++++++++++++++++----------------------- po/wine.pot | 196 +++++++++++++++++++----------------------- po/zh_CN.po | 197 +++++++++++++++++++----------------------- po/zh_TW.po | 197 +++++++++++++++++++----------------------- programs/taskmgr/dbgchnl.c | 13 +-- programs/taskmgr/resource.h | 4 - programs/taskmgr/taskmgr.rc | 4 - 48 files changed, 4057 insertions(+), 4797 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d463243754a179b3a0389…

1 0

Frédéric Delanoy : po: Remove untranslated English strings from the Polish translation.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

Module: wine Branch: master Commit: e55bde601a9c91c71a2fabdfa688ffd394578cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55bde601a9c91c71a2fabdfa… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 23:57:27 2012 +0100 po: Remove untranslated English strings from the Polish translation. --- po/pl.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/po/pl.po b/po/pl.po index 708dccc..ebbf2c8 100644 --- a/po/pl.po +++ b/po/pl.po @@ -3063,7 +3063,7 @@ msgstr "Skopiuj wybrane" #: gphoto2.rc:32 msgid "Preview" -msgstr "Preview" +msgstr "" #: gphoto2.rc:33 msgid "Import All" @@ -3071,7 +3071,7 @@ msgstr "Skopiuj wszystkie" #: gphoto2.rc:34 msgid "Skip This Dialog" -msgstr "Skip This Dialog" +msgstr "" #: gphoto2.rc:35 msgid "Exit" @@ -7984,15 +7984,15 @@ msgstr "Przykładowe wideo" #: shell32.rc:229 msgid "Saved Games" -msgstr "Saved Games" +msgstr "" #: shell32.rc:230 msgid "Searches" -msgstr "Searches" +msgstr "" #: shell32.rc:231 msgid "Users" -msgstr "Users" +msgstr "" #: shell32.rc:233 msgid "Downloads" @@ -10926,7 +10926,7 @@ msgstr "Zmień &ikonę..." #: progman.rc:189 msgid "Change Icon" -msgstr "Change Icon" +msgstr "" #: progman.rc:191 msgid "&Filename:"

1 0

Eric Pouech : kernel32: Added a couple of tests about console creation through CreateFile, and fix some corner cases.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

Module: wine Branch: master Commit: d967484ecc1f6a8c4f84b9d04a630c566d7c11ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d967484ecc1f6a8c4f84b9d04… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Feb 7 21:40:46 2012 +0100 kernel32: Added a couple of tests about console creation through CreateFile, and fix some corner cases. --- dlls/kernel32/file.c | 4 ++- dlls/kernel32/tests/console.c | 63 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 194960b..a3b4411 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1286,7 +1286,9 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, if (!strcmpiW(filename, coninW) || !strcmpiW(filename, conoutW)) { - ret = OpenConsoleW(filename, access, (sa && sa->bInheritHandle), creation); + ret = OpenConsoleW(filename, access, (sa && sa->bInheritHandle), + creation ? OPEN_EXISTING : 0); + if (ret == INVALID_HANDLE_VALUE) SetLastError(ERROR_INVALID_PARAMETER); goto done; } diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index f248666..7eea5d9 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1116,6 +1116,68 @@ static void test_OpenConsoleW(void) CloseHandle(ret); } +static void test_CreateFileW(void) +{ + static const WCHAR coninW[] = {'C','O','N','I','N','$',0}; + static const WCHAR conoutW[] = {'C','O','N','O','U','T','$',0}; + + static const struct + { + LPCWSTR name; + DWORD access; + BOOL inherit; + DWORD creation; + DWORD gle; + BOOL is_broken; + } cf_table[] = { + {coninW, 0, FALSE, 0, ERROR_INVALID_PARAMETER, TRUE}, + {coninW, 0, FALSE, OPEN_ALWAYS, 0, FALSE}, + {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, 0, ERROR_INVALID_PARAMETER, TRUE}, + {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_NEW, 0, FALSE}, + {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_ALWAYS, 0, FALSE}, + {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_ALWAYS, 0, FALSE}, + {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, TRUNCATE_EXISTING, 0, FALSE}, + {conoutW, 0, FALSE, 0, ERROR_INVALID_PARAMETER, TRUE}, + {conoutW, 0, FALSE, OPEN_ALWAYS, 0, FALSE}, + {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, 0, ERROR_INVALID_PARAMETER, TRUE}, + {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_NEW, 0, FALSE}, + {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_ALWAYS, 0, FALSE}, + {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_ALWAYS, 0, FALSE}, + {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, TRUNCATE_EXISTING, 0, FALSE}, + }; + + int index; + HANDLE ret; + SECURITY_ATTRIBUTES sa; + + for (index = 0; index < sizeof(cf_table)/sizeof(cf_table[0]); index++) + { + SetLastError(0xdeadbeef); + + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = NULL; + sa.bInheritHandle = cf_table[index].inherit; + + ret = CreateFileW(cf_table[index].name, cf_table[index].access, + FILE_SHARE_READ|FILE_SHARE_WRITE, &sa, + cf_table[index].creation, FILE_ATTRIBUTE_NORMAL, NULL); + if (ret == INVALID_HANDLE_VALUE) + { + ok(cf_table[index].gle, + "Expected CreateFileW not to return INVALID_HANDLE_VALUE for index %d\n", index); + ok(GetLastError() == cf_table[index].gle, + "Expected GetLastError() to return %u for index %d, got %u\n", + cf_table[index].gle, index, GetLastError()); + } + else + { + ok(!cf_table[index].gle || broken(cf_table[index].is_broken) /* Win7 */, + "Expected CreateFileW to succeed for index %d\n", index); + CloseHandle(ret); + } + } +} + static void test_VerifyConsoleIoHandle( HANDLE handle ) { BOOL ret; @@ -2546,6 +2608,7 @@ START_TEST(console) test_GetConsoleProcessList(); test_OpenConsoleW(); + test_CreateFileW(); test_OpenCON(); test_VerifyConsoleIoHandle(hConOut); test_GetSetStdHandle();

1 0

Jacek Caban : mshtml: Removed code duplication in frame collection tests.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

Module: wine Branch: master Commit: 666004cdbd5a73d76b8db4a4f3f40534b4b5a943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=666004cdbd5a73d76b8db4a4f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 8 15:57:53 2012 +0100 mshtml: Removed code duplication in frame collection tests. --- dlls/mshtml/tests/dom.c | 94 ++++++++++++----------------------------------- 1 files changed, 24 insertions(+), 70 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a847998..6ceb9ea 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5832,27 +5832,12 @@ static void test_frame(IDispatch *disp, const char *exp_id) IHTMLDocument2_Release(top_doc); } -static void test_frameset(IHTMLDocument2 *doc) +static void test_frames_collection(IHTMLFramesCollection2 *frames, const char *frid) { - IHTMLWindow2 *window; - IHTMLFramesCollection2 *frames; - IHTMLElement *elem; - IHTMLFrameBase *fbase; - LONG length; VARIANT index_var, result_var; - BSTR str; + LONG length; HRESULT hres; - window = get_doc_window(doc); - - /* test using IHTMLFramesCollection object */ - - hres = IHTMLWindow2_get_frames(window, &frames); - ok(hres == S_OK, "IHTMLWindow2_get_frames failed: 0x%08x\n", hres); - IHTMLWindow2_Release(window); - if(FAILED(hres)) - return; - /* test result length */ hres = IHTMLFramesCollection2_get_length(frames, &length); ok(hres == S_OK, "IHTMLFramesCollection2_get_length failed: 0x%08x\n", hres); @@ -5888,12 +5873,12 @@ static void test_frameset(IHTMLDocument2 *doc) /* string argument (element id lookup) */ V_VT(&index_var) = VT_BSTR; - V_BSTR(&index_var) = a2bstr("fr1"); + V_BSTR(&index_var) = a2bstr(frid); hres = IHTMLFramesCollection2_item(frames, &index_var, &result_var); ok(hres == S_OK, "IHTMLFramesCollection2_item failed: 0x%08x\n", hres); if(SUCCEEDED(hres)) { ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x\n", V_VT(&result_var)); - test_frame(V_DISPATCH(&result_var), "fr1"); + test_frame(V_DISPATCH(&result_var), frid); } VariantClear(&result_var); VariantClear(&index_var); @@ -5905,63 +5890,31 @@ static void test_frameset(IHTMLDocument2 *doc) ok(hres == E_INVALIDARG, "IHTMLFramesCollection2_item should have" "failed with E_INVALIDARG, instead: 0x%08x\n", hres); VariantClear(&result_var); +} - IHTMLFramesCollection2_Release(frames); - - /* test using IHTMLWindow2 inheritance */ - - /* test result length */ - hres = IHTMLWindow2_get_length(window, &length); - ok(hres == S_OK, "IHTMLWindow2_get_length failed: 0x%08x\n", hres); - ok(length == 3, "IHTMLWindow2_get_length should have been 3, was: %d\n", length); +static void test_frameset(IHTMLDocument2 *doc) +{ + IHTMLWindow2 *window; + IHTMLFramesCollection2 *frames; + IHTMLElement *elem; + IHTMLFrameBase *fbase; + BSTR str; + HRESULT hres; - /* test first frame */ - V_VT(&index_var) = VT_I4; - V_I4(&index_var) = 0; - hres = IHTMLWindow2_item(window, &index_var, &result_var); - ok(hres == S_OK, "IHTMLWindow2_item failed: 0x%08x\n", hres); - if(SUCCEEDED(hres)) { - ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x\n", V_VT(&result_var)); - test_frame((IDispatch*)V_DISPATCH(&result_var), "fr1"); - } - VariantClear(&result_var); + window = get_doc_window(doc); - /* test second frame */ - V_I4(&index_var) = 1; - hres = IHTMLWindow2_item(window, &index_var, &result_var); - ok(hres == S_OK, "IHTMLWindow2_item failed: 0x%08x\n", hres); - if(SUCCEEDED(hres)) { - ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x\n", V_VT(&result_var)); - test_frame((IDispatch*)V_DISPATCH(&result_var), "fr2"); - } - VariantClear(&result_var); + /* test using IHTMLFramesCollection object */ - /* fail on next frame */ - V_I4(&index_var) = 3; - hres = IHTMLWindow2_item(window, &index_var, &result_var); - ok(hres == DISP_E_MEMBERNOTFOUND, "IHTMLWindow2_item should have" - "failed with DISP_E_MEMBERNOTFOUND, instead: 0x%08x\n", hres); - VariantClear(&result_var); + hres = IHTMLWindow2_get_frames(window, &frames); + ok(hres == S_OK, "IHTMLWindow2_get_frames failed: 0x%08x\n", hres); + if(FAILED(hres)) + return; - /* string argument (element id lookup) */ - V_VT(&index_var) = VT_BSTR; - V_BSTR(&index_var) = a2bstr("fr2"); - hres = IHTMLWindow2_item(window, &index_var, &result_var); - ok(hres == S_OK, "IHTMLWindow2_item failed: 0x%08x\n", hres); - if(SUCCEEDED(hres)) { - ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x\n", V_VT(&result_var)); - test_frame((IDispatch*)V_DISPATCH(&result_var), "fr2"); - } - VariantClear(&result_var); - VariantClear(&index_var); + test_frames_collection(frames, "fr1"); + IHTMLFramesCollection2_Release(frames); - /* invalid argument */ - V_VT(&index_var) = VT_BOOL; - V_BOOL(&index_var) = VARIANT_TRUE; - hres = IHTMLWindow2_item(window, &index_var, &result_var); - ok(hres == E_INVALIDARG, "IHTMLWindow2_item should have" - "failed with E_INVALIDARG, instead: 0x%08x\n", hres); - VariantClear(&result_var); + /* test using IHTMLWindow2 inheritance */ + test_frames_collection((IHTMLFramesCollection2*)window, "fr2"); /* getElementById with node name attributes */ elem = get_doc_elem_by_id(doc, "nm1"); @@ -6018,6 +5971,7 @@ static void test_frameset(IHTMLDocument2 *doc) IHTMLFrameBase_Release(fbase); IHTMLElement_Release(elem); + IHTMLWindow2_Release(window); } static IHTMLDocument2 *create_docfrag(IHTMLDocument2 *doc)

1 0