January 2013 - Wine-Commits

Alexandre Julliard : gdi32: Implement RemoveFontResource.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: 4fc8bf18f3050f7e28d04b21caadfaf7854d483a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fc8bf18f3050f7e28d04b21c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 15 12:34:40 2013 +0100 gdi32: Implement RemoveFontResource. --- dlls/gdi32/freetype.c | 89 +++++++++++++++++++++++++++++++++++++++++++++- dlls/gdi32/tests/font.c | 3 +- 2 files changed, 88 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 97f820c..59ac9a4 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -537,6 +537,7 @@ static BOOL use_default_fallback = FALSE; static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, FT_UInt *glyph); static BOOL get_outline_text_metrics(GdiFont *font); static BOOL get_text_metrics(GdiFont *font, LPTEXTMETRICW ptm); +static void remove_face_from_cache( Face *face ); static const WCHAR system_link[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s',' ','N','T','\\', @@ -1257,6 +1258,7 @@ static void release_face( Face *face ) if (--face->refcount) return; if (face->family) { + if (face->flags & ADDFONT_ADD_TO_CACHE) remove_face_from_cache( face ); list_remove( &face->entry ); release_family( face->family ); } @@ -1565,6 +1567,27 @@ static void add_face_to_cache(Face *face) RegCloseKey(hkey_family); } +static void remove_face_from_cache( Face *face ) +{ + HKEY hkey_family; + + RegOpenKeyExW( hkey_font_cache, face->family->FamilyName, 0, KEY_ALL_ACCESS, &hkey_family ); + + if (face->scalable) + { + RegDeleteKeyW( hkey_family, face->StyleName ); + } + else + { + static const WCHAR fmtW[] = {'%','s','\\','%','d',0}; + WCHAR *face_key_name = HeapAlloc(GetProcessHeap(), 0, (strlenW(face->StyleName) + 10) * sizeof(WCHAR)); + sprintfW(face_key_name, fmtW, face->StyleName, face->size.y_ppem); + RegDeleteKeyW( hkey_family, face_key_name ); + HeapFree(GetProcessHeap(), 0, face_key_name); + } + RegCloseKey(hkey_family); +} + static WCHAR *prepend_at(WCHAR *family) { WCHAR *str; @@ -1959,6 +1982,36 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ return ret; } +static int remove_font_resource( const char *file, DWORD flags ) +{ + Family *family, *family_next; + Face *face, *face_next; + char *filename; + struct stat st, st2; + int count = 0; + + if (stat( file, &st ) == -1) return 0; + LIST_FOR_EACH_ENTRY_SAFE( family, family_next, &font_list, Family, entry ) + { + family->refcount++; + LIST_FOR_EACH_ENTRY_SAFE( face, face_next, &family->faces, Face, entry ) + { + if (!face->file) continue; + if (LOWORD(face->flags) != LOWORD(flags)) continue; + filename = strWtoA( CP_UNIXCP, face->file ); + if (!stat( filename, &st2 ) && st.st_dev == st2.st_dev && st.st_ino == st2.st_ino) + { + TRACE( "removing matching face %s\n", debugstr_w(face->file) ); + release_face( face ); + count++; + } + HeapFree( GetProcessHeap(), 0, filename ); + } + release_family( family ); + } + return count; +} + static void DumpFontList(void) { Family *family; @@ -2914,9 +2967,41 @@ HANDLE WineEngAddFontMemResourceEx(PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD */ BOOL WineEngRemoveFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) { + INT ret = 0; + GDI_CheckNotLock(); - FIXME("(%s, %x, %p): stub\n", debugstr_w(file), flags, pdv); - return TRUE; + + if (ft_handle) /* do it only if we have freetype up and running */ + { + char *unixname; + + EnterCriticalSection( &freetype_cs ); + + if ((unixname = wine_get_unix_file_name(file))) + { + DWORD addfont_flags = ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE; + + if(!(flags & FR_PRIVATE)) addfont_flags |= ADDFONT_ADD_TO_CACHE; + ret = remove_font_resource( unixname, addfont_flags ); + HeapFree(GetProcessHeap(), 0, unixname); + } + if (!ret && !strchrW(file, '\\')) + { + if ((unixname = get_winfonts_dir_path( file ))) + { + ret = remove_font_resource( unixname, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE ); + HeapFree(GetProcessHeap(), 0, unixname); + } + if (!ret && (unixname = get_data_dir_path( file ))) + { + ret = remove_font_resource( unixname, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE ); + HeapFree(GetProcessHeap(), 0, unixname); + } + } + + LeaveCriticalSection( &freetype_cs ); + } + return ret; } static char *get_ttf_file_name( LPCWSTR font_file, LPCWSTR font_path ) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 337a6b9..1dfdd11 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4451,7 +4451,6 @@ static void test_CreateScalableFontResource(void) ok(ret, "DeleteFile() error %d\n", GetLastError()); ret = pRemoveFontResourceExA(fot_name, 0, 0); -todo_wine ok(!ret, "RemoveFontResourceEx() should fail\n"); /* test public font resource */ @@ -4472,11 +4471,11 @@ todo_wine test_GetGlyphOutline_empty_contour(); ret = pRemoveFontResourceExA(fot_name, FR_PRIVATE, 0); -todo_wine ok(!ret, "RemoveFontResourceEx() with not matching flags should fail\n"); SetLastError(0xdeadbeef); ret = pRemoveFontResourceExA(fot_name, 0, 0); +todo_wine ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError()); ret = is_truetype_font_installed("wine_test");

1 0

Alexandre Julliard : gdi32: Keep the main font cache key open.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: 4d72b082ed1056fce52dc20d24302bff1d65d18b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d72b082ed1056fce52dc20d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 15 13:56:52 2013 +0100 gdi32: Keep the main font cache key open. --- dlls/gdi32/freetype.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5a79b35..97f820c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -518,6 +518,7 @@ struct font_mapping static struct list mappings_list = LIST_INIT( mappings_list ); static UINT default_aa_flags; +static HKEY hkey_font_cache; static CRITICAL_SECTION freetype_cs; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -1516,11 +1517,9 @@ static LONG create_font_cache_key(HKEY *hkey, DWORD *disposition) static void add_face_to_cache(Face *face) { - HKEY hkey_font_cache, hkey_family, hkey_face; + HKEY hkey_family, hkey_face; WCHAR *face_key_name; - create_font_cache_key(&hkey_font_cache, NULL); - RegCreateKeyExW(hkey_font_cache, face->family->FamilyName, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey_family, NULL); if(face->family->EnglishName) @@ -1564,7 +1563,6 @@ static void add_face_to_cache(Face *face) } RegCloseKey(hkey_face); RegCloseKey(hkey_family); - RegCloseKey(hkey_font_cache); } static WCHAR *prepend_at(WCHAR *family) @@ -3794,7 +3792,6 @@ static void reorder_font_list(void) */ BOOL WineEngInit(void) { - HKEY hkey_font_cache; DWORD disposition; HANDLE font_mutex; @@ -3817,8 +3814,6 @@ BOOL WineEngInit(void) else load_font_list_from_cache(hkey_font_cache); - RegCloseKey(hkey_font_cache); - reorder_font_list(); DumpFontList();

1 0

Alexandre Julliard : gdi32: Add helper functions to compute font paths for AddFontResource.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: ab0ad4f5d81511b66728bd32e7d429550cb28e5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab0ad4f5d81511b66728bd32e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 14 17:28:25 2013 +0100 gdi32: Add helper functions to compute font paths for AddFontResource. --- dlls/gdi32/freetype.c | 57 +++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 22080b1..5a79b35 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2614,27 +2614,33 @@ static void load_mac_fonts(void) #endif -static BOOL load_font_from_data_dir(LPCWSTR file) +static char *get_data_dir_path( LPCWSTR file ) { - BOOL ret = FALSE; + char *unix_name = NULL; const char *data_dir = wine_get_data_dir(); if (!data_dir) data_dir = wine_get_build_dir(); if (data_dir) { - INT len; - char *unix_name; - - len = WideCharToMultiByte(CP_UNIXCP, 0, file, -1, NULL, 0, NULL, NULL); + INT len = WideCharToMultiByte(CP_UNIXCP, 0, file, -1, NULL, 0, NULL, NULL); unix_name = HeapAlloc(GetProcessHeap(), 0, strlen(data_dir) + len + sizeof("/fonts/")); - strcpy(unix_name, data_dir); strcat(unix_name, "/fonts/"); WideCharToMultiByte(CP_UNIXCP, 0, file, -1, unix_name + strlen(unix_name), len, NULL, NULL); + } + return unix_name; +} +static BOOL load_font_from_data_dir(LPCWSTR file) +{ + BOOL ret = FALSE; + char *unix_name = get_data_dir_path( file ); + + if (unix_name) + { EnterCriticalSection( &freetype_cs ); ret = AddFontToList(unix_name, NULL, 0, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE); LeaveCriticalSection( &freetype_cs ); @@ -2643,24 +2649,16 @@ static BOOL load_font_from_data_dir(LPCWSTR file) return ret; } -static BOOL load_font_from_winfonts_dir(LPCWSTR file) +static char *get_winfonts_dir_path(LPCWSTR file) { static const WCHAR slashW[] = {'\\','\0'}; - BOOL ret = FALSE; WCHAR windowsdir[MAX_PATH]; - char *unixname; GetWindowsDirectoryW(windowsdir, sizeof(windowsdir) / sizeof(WCHAR)); strcatW(windowsdir, fontsW); strcatW(windowsdir, slashW); strcatW(windowsdir, file); - if ((unixname = wine_get_unix_file_name(windowsdir))) { - EnterCriticalSection( &freetype_cs ); - ret = AddFontToList(unixname, NULL, 0, ADDFONT_ALLOW_BITMAP); - LeaveCriticalSection( &freetype_cs ); - HeapFree(GetProcessHeap(), 0, unixname); - } - return ret; + return wine_get_unix_file_name( windowsdir ); } static void load_system_fonts(void) @@ -2846,31 +2844,34 @@ INT WineEngAddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) { char *unixname; - if(flags) - FIXME("Ignoring flags %x\n", flags); + EnterCriticalSection( &freetype_cs ); if((unixname = wine_get_unix_file_name(file))) { DWORD addfont_flags = ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE; if(!(flags & FR_PRIVATE)) addfont_flags |= ADDFONT_ADD_TO_CACHE; - EnterCriticalSection( &freetype_cs ); ret = AddFontToList(unixname, NULL, 0, addfont_flags); - LeaveCriticalSection( &freetype_cs ); HeapFree(GetProcessHeap(), 0, unixname); } if (!ret && !strchrW(file, '\\')) { /* Try in %WINDIR%/fonts, needed for Fotobuch Designer */ - ret = load_font_from_winfonts_dir(file); - if (!ret) { - /* Try in datadir/fonts (or builddir/fonts), - * needed for Magic the Gathering Online - */ - ret = load_font_from_data_dir(file); + if ((unixname = get_winfonts_dir_path( file ))) + { + ret = AddFontToList(unixname, NULL, 0, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE); + HeapFree(GetProcessHeap(), 0, unixname); + } + /* Try in datadir/fonts (or builddir/fonts), needed for Magic the Gathering Online */ + if (!ret && (unixname = get_data_dir_path( file ))) + { + ret = AddFontToList(unixname, NULL, 0, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_RESOURCE); + HeapFree(GetProcessHeap(), 0, unixname); } } + + LeaveCriticalSection( &freetype_cs ); } - return ret; + return ret; } /*************************************************************

1 0

Alexandre Julliard : gdi32: Initialize fontconfig even when fonts are cached.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: 0b10f0b8547f05780841bc476955ea2e1faa1e0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b10f0b8547f05780841bc476… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 15 14:28:10 2013 +0100 gdi32: Initialize fontconfig even when fonts are cached. --- dlls/gdi32/freetype.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 59ac9a4..639fb63 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3703,10 +3703,6 @@ static void init_font_list(void) char *unixname; const char *data_dir; -#ifdef SONAME_LIBFONTCONFIG - init_fontconfig(); -#endif - delete_external_font_keys(); /* load the system bitmap fonts */ @@ -3885,6 +3881,10 @@ BOOL WineEngInit(void) if(!init_freetype()) return FALSE; +#ifdef SONAME_LIBFONTCONFIG + init_fontconfig(); +#endif + if((font_mutex = CreateMutexW(NULL, FALSE, font_mutex_nameW)) == NULL) { ERR("Failed to create font mutex\n");

1 0

Alexandre Julliard : gdi32: Add support for . fot files in RemoveFontResource.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: 46532e8d8a5cd0f963231e15cb7d80cc88b3de2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=46532e8d8a5cd0f963231e15c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 15 12:54:02 2013 +0100 gdi32: Add support for .fot files in RemoveFontResource. --- dlls/gdi32/font.c | 20 +++++++++++++++++++- dlls/gdi32/tests/font.c | 15 ++++----------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index c6a6946..fe211a1 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3565,7 +3565,25 @@ BOOL WINAPI RemoveFontResourceExA( LPCSTR str, DWORD fl, PVOID pdv ) */ BOOL WINAPI RemoveFontResourceExW( LPCWSTR str, DWORD fl, PVOID pdv ) { - return WineEngRemoveFontResourceEx(str, fl, pdv); + int ret = WineEngRemoveFontResourceEx( str, fl, pdv ); + WCHAR *filename; + + if (ret == 0) + { + /* FreeType <2.3.5 has problems reading resources wrapped in PE files. */ + HMODULE hModule = LoadLibraryExW(str, NULL, LOAD_LIBRARY_AS_DATAFILE); + if (hModule != NULL) + { + WARN("Can't unload resources from PE file %s\n", wine_dbgstr_w(str)); + FreeLibrary(hModule); + } + else if ((filename = get_scalable_filename( str )) != NULL) + { + ret = WineEngRemoveFontResourceEx( filename, fl, pdv ); + HeapFree( GetProcessHeap(), 0, filename ); + } + } + return ret; } /*********************************************************************** diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 1dfdd11..62997d1 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4475,22 +4475,11 @@ static void test_CreateScalableFontResource(void) SetLastError(0xdeadbeef); ret = pRemoveFontResourceExA(fot_name, 0, 0); -todo_wine ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError()); ret = is_truetype_font_installed("wine_test"); -todo_wine ok(!ret, "font wine_test should not be enumerated\n"); - /* FIXME: since RemoveFontResource is a stub correct testing is impossible */ - if (ret) - { - /* remove once RemoveFontResource is implemented */ - DeleteFile(fot_name); - DeleteFile(ttf_name); - return; - } - ret = pRemoveFontResourceExA(fot_name, 0, 0); ok(!ret, "RemoveFontResourceEx() should fail\n"); @@ -4509,17 +4498,21 @@ todo_wine ok(ret, "AddFontResourceEx() error %d\n", GetLastError()); ret = is_truetype_font_installed("wine_test"); + todo_wine ok(!ret, "font wine_test should not be enumerated\n"); /* XP allows removing a private font added with 0 flags */ SetLastError(0xdeadbeef); ret = pRemoveFontResourceExA(fot_name, FR_PRIVATE, 0); + todo_wine ok(ret, "RemoveFontResourceEx() error %d\n", GetLastError()); ret = is_truetype_font_installed("wine_test"); + todo_wine ok(!ret, "font wine_test should not be enumerated\n"); ret = pRemoveFontResourceExA(fot_name, 0, 0); + todo_wine ok(!ret, "RemoveFontResourceEx() should fail\n"); DeleteFile(fot_name);

1 0

Jacek Caban : atl100: Don't leak TLIBATTR in AtlComModuleUnregisterServer.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: 022d02cca526375a4942b844d2e5150008692ef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=022d02cca526375a4942b844d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 15 12:46:06 2013 +0100 atl100: Don't leak TLIBATTR in AtlComModuleUnregisterServer. --- dlls/atl100/atl.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 28321c2..c4867aa 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -493,8 +493,10 @@ HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeL SysFreeString(path); hres = ITypeLib_GetLibAttr(typelib, &attr); - if(SUCCEEDED(hres)) + if(SUCCEEDED(hres)) { hres = UnRegisterTypeLib(&attr->guid, attr->wMajorVerNum, attr->wMinorVerNum, attr->lcid, attr->syskind); + ITypeLib_ReleaseTLibAttr(typelib, attr); + } ITypeLib_Release(typelib); if(FAILED(hres)) return hres;

1 0

Jacek Caban : mshtml: Added IHTMLScriptElement::put_text tests.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: b6bc92aaa96705589d204f98b7ffe59ef129365d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6bc92aaa96705589d204f98b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 15 13:40:04 2013 +0100 mshtml: Added IHTMLScriptElement::put_text tests. --- dlls/mshtml/tests/exectest.html | 53 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/exectest.html b/dlls/mshtml/tests/exectest.html index e1e73f6..ca06e3c 100644 --- a/dlls/mshtml/tests/exectest.html +++ b/dlls/mshtml/tests/exectest.html @@ -5,6 +5,7 @@ Script execution test <div id="b2"></div> <div id="b3"></div> <script id="emptyscript"></script> +<script id="put_text_script">2+2</script> <script> function ok(b, msg) { return external.ok(b, msg); @@ -12,6 +13,7 @@ function ok(b, msg) { var executed = false; var extern_cnt = 0; +var exec_cnt; function testWriteScript() { var len = document.getElementsByTagName('div').length; @@ -24,7 +26,7 @@ function testWriteScript() { + "<" + "/script>"); len = document.getElementsByTagName('script').length; - ok(len === 3, "script col length = " + len); + ok(len === 4, "script col length = " + len); ok(executed, "written script not executed"); } @@ -36,9 +38,22 @@ function testPutSrc() { ok(extern_cnt === 0, "extern_cnt = " + extern_cnt + " expected 0"); } +function testPutText() { + var elem = document.getElementById("put_text_script"); + + exec_cnt = 0; + elem.text = "exec_cnt++;"; + ok(exec_cnt === 1, "put_text_script exec_cnt " + exec_cnt); + + exec_cnt = 0; + elem.text = "exec_cnt++;"; + ok(exec_cnt === 1, "put_text_script exec_cnt " + exec_cnt); +} + try { testWriteScript(); testPutSrc(); + testPutText(); }catch(e) { ok(false, "Got an exception"); } @@ -67,10 +82,46 @@ function testPutSrc2() { ok(extern_cnt === 4, "extern_cnt = " + extern_cnt + " expected 4"); } +function testPutText2() { + var elem; + + elem = document.createElement("script"); + exec_cnt = 0; + elem.text = "exec_cnt++;"; + ok(exec_cnt === 0, "script exec_cnt " + exec_cnt); + + document.body.appendChild(elem); + ok(exec_cnt === 1, "script exec_cnt " + exec_cnt); + exec_cnt = 0; + elem.text = "exec_cnt++;"; + ok(exec_cnt === 1, "script exec_cnt " + exec_cnt); + + elem.src = "externscr.js"; + ok(extern_cnt === 5, "extern_cnt = " + extern_cnt + " expected 5"); + + exec_cnt = 0; + ok(extern_cnt === 5, "> extern_cnt = " + extern_cnt + " expected 5"); + elem.text = "exec_cnt++;"; /* forces evaluation, but src will be executed */ + ok(exec_cnt === 0, "script exec_cnt " + exec_cnt); + ok(extern_cnt === 6, "< extern_cnt = " + extern_cnt + " expected 6"); + + elem = document.createElement("script"); + exec_cnt = 0; + elem.text = "exec_cnt++;"; + ok(exec_cnt === 0, "script exec_cnt " + exec_cnt); + elem.src = "externscr.js"; + ok(extern_cnt === 6, "extern_cnt = " + extern_cnt + " expected 6"); + + document.body.appendChild(elem); + ok(exec_cnt === 0, "script exec_cnt " + exec_cnt); + ok(extern_cnt === 7, "extern_cnt = " + extern_cnt + " expected 7"); +} + document.body.onload = function() { ok(extern_cnt === 1, "extern_cnt = " + extern_cnt); try { testPutSrc2(); + testPutText2(); }catch(e) { ok(false, "got an exception"); }

1 0

Stefan Dösinger : wined3d: Shadow buffers in sysmem when software vertexprocessing is used.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: 151407e5bfbd393ed83526649e1b2a62878c7690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=151407e5bfbd393ed83526649… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 15 14:03:18 2013 +0100 wined3d: Shadow buffers in sysmem when software vertexprocessing is used. --- dlls/wined3d/buffer.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c8217e6..415b5e5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1207,6 +1207,15 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device TRACE("size %#x, usage %#x, format %s, memory @ %p, iface @ %p.\n", buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format->id), buffer->resource.allocatedMemory, buffer); + if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING) + { + /* SWvp always returns the same pointer in buffer maps and retains data in DISCARD maps. + * Keep a system memory copy of the buffer to provide the same behavior to the application. + * Still use a VBO to support OpenGL 3 core contexts. */ + TRACE("Using doublebuffer mode because of software vertex processing\n"); + buffer->flags |= WINED3D_BUFFER_DOUBLEBUFFER; + } + dynamic_buffer_ok = gl_info->supported[APPLE_FLUSH_BUFFER_RANGE] || gl_info->supported[ARB_MAP_BUFFER_RANGE]; /* Observations show that drawStridedSlow is faster on dynamic VBs than converting +

1 0

Aric Stewart : ups10: Mark to Base, Mark and Ligature are not cumulative offsets.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: e5ab22d684e1d17c0ab1a2a757404379ab633ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ab22d684e1d17c0ab1a2a75… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 15 07:09:29 2013 -0600 ups10: Mark to Base, Mark and Ligature are not cumulative offsets. --- dlls/usp10/opentype.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 05b8cab..e729919 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1734,10 +1734,13 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, c if (desU.x || desU.y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY); - if (!analysis->fRTL) pGoffset[glyph_index].du -= piAdvance[glyph_index-1]; - else if (analysis->fLogicalOrder) devX *= -1; - pGoffset[glyph_index].du += round(devX); - pGoffset[glyph_index].dv += round(devY); + if (!analysis->fRTL) pGoffset[glyph_index].du = round(devX) - piAdvance[glyph_index-1]; + else + { + if (analysis->fLogicalOrder) devX *= -1; + pGoffset[glyph_index].du = round(devX); + } + pGoffset[glyph_index].dv = round(devY); } break; } @@ -1749,8 +1752,8 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, c if (desU.x || desU.y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY); - pGoffset[glyph_index].du += (round(devX) - piAdvance[glyph_index-1]); - pGoffset[glyph_index].dv += round(devY); + pGoffset[glyph_index].du = (round(devX) - piAdvance[glyph_index-1]); + pGoffset[glyph_index].dv = round(devY); } break; } @@ -1764,8 +1767,8 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, c { GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY); if (analysis->fRTL && analysis->fLogicalOrder) devX *= -1; - pGoffset[glyph_index].du += round(devX) + pGoffset[glyph_index - write_dir].du; - pGoffset[glyph_index].dv += round(devY) + pGoffset[glyph_index - write_dir].dv; + pGoffset[glyph_index].du = round(devX) + pGoffset[glyph_index - write_dir].du; + pGoffset[glyph_index].dv = round(devY) + pGoffset[glyph_index - write_dir].dv; } break; }

1 0

Stefan Dösinger : d3d8/tests: Add a software vertexprocessing buffer discard test.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: f30b6d0b4af97e2deafeae4b3872d09af0c026d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f30b6d0b4af97e2deafeae4b3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 15 14:03:20 2013 +0100 d3d8/tests: Add a software vertexprocessing buffer discard test. --- dlls/d3d8/tests/device.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 17c3443..87d3f9e 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4532,6 +4532,101 @@ static void test_set_palette(void) DestroyWindow(window); } +static void test_swvp_buffer(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d8; + UINT refcount; + HWND window; + HRESULT hr; + unsigned int i; + IDirect3DVertexBuffer8 *buffer; + static const unsigned int bufsize = 1024; + D3DVERTEXBUFFER_DESC desc; + D3DPRESENT_PARAMETERS present_parameters = {0}; + struct + { + float x, y, z; + } *ptr, *ptr2; + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create d3d8 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = window; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.BackBufferWidth = screen_width; + present_parameters.BackBufferHeight = screen_height; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.EnableAutoDepthStencil = FALSE; + if (FAILED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateVertexBuffer(device, bufsize * sizeof(*ptr), D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0, + D3DPOOL_DEFAULT, &buffer); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_GetDesc(buffer, &desc); + ok(SUCCEEDED(hr), "Failed to get desc, hr %#x.\n", hr); + ok(desc.Pool == D3DPOOL_DEFAULT, "Got pool %u, expected D3DPOOL_DEFAULT\n", desc.Pool); + ok(desc.Usage == (D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY), + "Got usage %u, expected D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY\n", desc.Usage); + + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, bufsize * sizeof(*ptr), (BYTE **)&ptr, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + for (i = 0; i < bufsize; i++) + { + ptr[i].x = i * 1.0f; + ptr[i].y = i * 2.0f; + ptr[i].z = i * 3.0f; + } + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, buffer, sizeof(*ptr)); + ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, bufsize * sizeof(*ptr2), (BYTE **)&ptr2, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + ok(ptr == ptr2, "Lock returned two different pointers: %p, %p\n", ptr, ptr2); + for (i = 0; i < bufsize; i++) + { + if (ptr2[i].x != i * 1.0f || ptr2[i].y != i * 2.0f || ptr2[i].z != i * 3.0f) + { + ok(FALSE, "Vertex %u is %f,%f,%f, expected %f,%f,%f\n", i, + ptr2[i].x, ptr2[i].y, ptr2[i].z, i * 1.0f, i * 2.0f, i * 3.0f); + break; + } + } + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + IDirect3DVertexBuffer8_Release(buffer); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -4606,6 +4701,7 @@ START_TEST(device) test_surface_double_unlock(); test_surface_lockrect_blocks(); test_set_palette(); + test_swvp_buffer(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0