May 2009 - Wine-commits - list.winehq.org

Vit Hrachovy : wine-website:added Wine Solaris packages links
by Jeremy Newman 06 May '09

06 May '09

Module: website Branch: master Commit: 4021b5a8651eb00fb40568700a7e601b8574a877 URL: http://source.winehq.org/git/website.git/?a=commit;h=4021b5a8651eb00fb40568… Author: Vit Hrachovy <vit.hrachovy(a)sandbox.cz> Date: Wed May 6 14:54:02 2009 +0200 wine-website:added Wine Solaris packages links Hi I've added links and info about Solaris and OpenSolaris packages for Wine to Wine website. Regards Vit >From 5b75d998fc06152eb231a52b82e72dfc1721d96e Mon Sep 17 00:00:00 2001 From: Vit Hrachovy <vh217449(a)argv.czech> Date: Wed, 6 May 2009 14:47:35 +0200 Subject: added Wine Solaris packages links --- images/distro/opensolaris.png | Bin 0 -> 5912 bytes images/distro/solaris.png | Bin 0 -> 641 bytes templates/de/home.template | 4 ++-- templates/en/download.template | 19 +++++++++++++++++++ templates/en/home.template | 4 ++-- templates/fr/home.template | 4 ++-- 6 files changed, 25 insertions(+), 6 deletions(-) diff --git a/images/distro/opensolaris.png b/images/distro/opensolaris.png new file mode 100644 index 0000000..37aa8bb Binary files /dev/null and b/images/distro/opensolaris.png differ diff --git a/images/distro/solaris.png b/images/distro/solaris.png new file mode 100644 index 0000000..67b47d2 Binary files /dev/null and b/images/distro/solaris.png differ diff --git a/templates/de/home.template b/templates/de/home.template index acf680d..95bc384 100644 --- a/templates/de/home.template +++ b/templates/de/home.template @@ -1,5 +1,5 @@ - - + +  <div id="main_left"> diff --git a/templates/en/download.template b/templates/en/download.template index 12829b9..ceb91ad 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -136,6 +136,25 @@ requested in exchange for hosting the Wine web site.</p> <td><a href="mailto:kris(a)pcbsd.com">Kris Moore</a></td> </tr> + <tr bgcolor="#ffffff"> + <td align="center"><a href="http://www.sunfreepacks.com/listing/?limit=1000&offset=0"> + <img src="{$root}/images/distro/solaris.png" width="50" height="50" alt="Solaris 10" border="0"></a> + </td> + <td> <b><a href="http://www.sunfreepacks.com/listing/?limit=1000&offset=0">Solaris 10, SXCE</a></b> + ASwine, ASwine-SXCE binary package .pkg for Solaris 10 and SXCE x86</td> + <td><a href="mailto:asyropoulos(a)yahoo.com">Apostolos Syropoulos</a></td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center"><a href="http://pkg.opensolaris.org/contrib/en/catalog.shtml"> + <img src="{$root}/images/distro/opensolaris.png" width="50" height="50" alt="OpenSolaris" border="0"></a> + </td> + <td> <b><a href="http://pkg.opensolaris.org/contrib/en/catalog.shtml">OpenSolaris</a></b> + binary package .pkg for OpenSolaris x86</td> + <td><a href="mailto:asyropoulos(a)yahoo.com">Apostolos Syropoulos</a></td> + </tr> + + </table> diff --git a/templates/en/home.template b/templates/en/home.template index 3560f32..bad2f62 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -1,5 +1,5 @@ - - + +  <div id="main_left"> diff --git a/templates/fr/home.template b/templates/fr/home.template index 7a504e2..9b3a7e0 100644 --- a/templates/fr/home.template +++ b/templates/fr/home.template @@ -1,5 +1,5 @@ - - + +  <div id="main_left">

1 0

Alexandre Julliard : user32: Make sure the system params DC cannot be deleted.
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: 1fa15f3d2f4434888cc6a6075b089e4f0feff349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fa15f3d2f4434888cc6a6075… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 5 15:36:44 2009 +0200 user32: Make sure the system params DC cannot be deleted. --- dlls/user32/sysparams.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 82940e4..0563271 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -710,7 +710,11 @@ static inline HDC get_display_dc(void) { static const WCHAR DISPLAY[] = {'D','I','S','P','L','A','Y',0}; static HDC display_dc; - if (!display_dc) display_dc = CreateICW( DISPLAY, NULL, NULL, NULL ); + if (!display_dc) + { + display_dc = CreateICW( DISPLAY, NULL, NULL, NULL ); + __wine_make_gdi_object_system( display_dc, TRUE ); + } return display_dc; }

1 0

Aric Stewart : msctf: Implement ITfCategoryMgr::RegisterGUID, ITfCategoryMgr::GetGUID and ITfCategoryMgr::IsEqualTfGuidAtom.
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: 19c2b7cbcbe8cfc810cb9ebea0231f11b4f749c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19c2b7cbcbe8cfc810cb9ebea… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon May 4 14:31:15 2009 -0500 msctf: Implement ITfCategoryMgr::RegisterGUID, ITfCategoryMgr::GetGUID and ITfCategoryMgr::IsEqualTfGuidAtom. --- dlls/msctf/categorymgr.c | 64 +++++++++++++++++++++++++++++++++--- dlls/msctf/msctf.c | 12 +++++++ dlls/msctf/msctf_internal.h | 2 + dlls/msctf/tests/inputprocessor.c | 40 +++++++++++++++++++++++ 4 files changed, 112 insertions(+), 6 deletions(-) diff --git a/dlls/msctf/categorymgr.c b/dlls/msctf/categorymgr.c index 3f47140..b76bebb 100644 --- a/dlls/msctf/categorymgr.c +++ b/dlls/msctf/categorymgr.c @@ -312,25 +312,77 @@ static HRESULT WINAPI CategoryMgr_RegisterGUID ( ITfCategoryMgr *iface, REFGUID rguid, TfGuidAtom *pguidatom ) { + DWORD index; + GUID *checkguid; + DWORD id; CategoryMgr *This = (CategoryMgr*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + + TRACE("(%p) %s %p\n",This,debugstr_guid(rguid),pguidatom); + + if (!pguidatom) + return E_INVALIDARG; + + index = 0; + do { + id = enumerate_Cookie(COOKIE_MAGIC_GUIDATOM,&index); + if (id && IsEqualGUID(rguid,get_Cookie_data(id))) + { + *pguidatom = id; + return S_OK; + } + } while(id); + + checkguid = HeapAlloc(GetProcessHeap(),0,sizeof(GUID)); + *checkguid = *rguid; + id = generate_Cookie(COOKIE_MAGIC_GUIDATOM,checkguid); + + if (!id) + { + HeapFree(GetProcessHeap(),0,checkguid); + return E_FAIL; + } + + *pguidatom = id; + + return S_OK; } static HRESULT WINAPI CategoryMgr_GetGUID ( ITfCategoryMgr *iface, TfGuidAtom guidatom, GUID *pguid) { CategoryMgr *This = (CategoryMgr*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + + TRACE("(%p) %i\n",This,guidatom); + + if (!pguid) + return E_INVALIDARG; + + *pguid = GUID_NULL; + + if (get_Cookie_magic(guidatom) == COOKIE_MAGIC_GUIDATOM) + *pguid = *((REFGUID)get_Cookie_data(guidatom)); + + return S_OK; } static HRESULT WINAPI CategoryMgr_IsEqualTfGuidAtom ( ITfCategoryMgr *iface, TfGuidAtom guidatom, REFGUID rguid, BOOL *pfEqual) { CategoryMgr *This = (CategoryMgr*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + + TRACE("(%p) %i %s %p\n",This,guidatom,debugstr_guid(rguid),pfEqual); + + if (!pfEqual) + return E_INVALIDARG; + + *pfEqual = FALSE; + if (get_Cookie_magic(guidatom) == COOKIE_MAGIC_GUIDATOM) + { + if (IsEqualGUID(rguid,get_Cookie_data(guidatom))) + *pfEqual = TRUE; + } + + return S_OK; } diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index fac0f9d..711ae51 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -252,6 +252,18 @@ LPVOID remove_Cookie(DWORD id) return cookies[index].data; } +DWORD enumerate_Cookie(DWORD magic, DWORD *index) +{ + int i; + for (i = *index; i < id_last; i++) + if (cookies[i].id != 0 && cookies[i].magic == magic) + { + *index = (i+1); + return cookies[i].id; + } + return 0x0; +} + /************************************************************************* * MSCTF DllMain */ diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index a9f7982..826c09d 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -23,6 +23,7 @@ #define COOKIE_MAGIC_TMSINK 0x0010 #define COOKIE_MAGIC_CONTEXTSINK 0x0020 +#define COOKIE_MAGIC_GUIDATOM 0x0030 extern DWORD tlsIndex; @@ -37,6 +38,7 @@ extern DWORD generate_Cookie(DWORD magic, LPVOID data); extern DWORD get_Cookie_magic(DWORD id); extern LPVOID get_Cookie_data(DWORD id); extern LPVOID remove_Cookie(DWORD id); +extern DWORD enumerate_Cookie(DWORD magic, DWORD *index); extern const WCHAR szwSystemTIPKey[]; #endif /* __WINE_MSCTF_I_H */ diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 9f2900a..b5ae508 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -609,6 +609,45 @@ static void test_endSession(void) test_OnSetFocus = SINK_UNEXPECTED; } +static void test_TfGuidAtom(void) +{ + GUID gtest,g1; + HRESULT hr; + TfGuidAtom atom1,atom2; + BOOL equal; + + CoCreateGuid(&gtest); + + /* msdn reports this should return E_INVALIDARG. However my test show it crashing (winxp)*/ + /* + hr = ITfCategoryMgr_RegisterGUID(g_cm,&gtest,NULL); + ok(hr==E_INVALIDARG,"ITfCategoryMgr_RegisterGUID should have failed\n"); + */ + hr = ITfCategoryMgr_RegisterGUID(g_cm,&gtest,&atom1); + ok(SUCCEEDED(hr),"ITfCategoryMgr_RegisterGUID failed\n"); + hr = ITfCategoryMgr_RegisterGUID(g_cm,&gtest,&atom2); + ok(SUCCEEDED(hr),"ITfCategoryMgr_RegisterGUID failed\n"); + ok(atom1 == atom2,"atoms do not match\n"); + hr = ITfCategoryMgr_GetGUID(g_cm,atom2,NULL); + ok(hr==E_INVALIDARG,"ITfCategoryMgr_GetGUID should have failed\n"); + hr = ITfCategoryMgr_GetGUID(g_cm,atom2,&g1); + ok(SUCCEEDED(hr),"ITfCategoryMgr_GetGUID failed\n"); + ok(IsEqualGUID(&g1,&gtest),"guids do not match\n"); + hr = ITfCategoryMgr_IsEqualTfGuidAtom(g_cm,atom1,&gtest,NULL); + ok(hr==E_INVALIDARG,"ITfCategoryMgr_IsEqualTfGuidAtom should have failed\n"); + hr = ITfCategoryMgr_IsEqualTfGuidAtom(g_cm,atom1,&gtest,&equal); + ok(SUCCEEDED(hr),"ITfCategoryMgr_IsEqualTfGuidAtom failed\n"); + ok(equal == TRUE,"Equal value invalid\n"); + + /* show that cid and tid TfClientIds are also TfGuidAtoms */ + hr = ITfCategoryMgr_IsEqualTfGuidAtom(g_cm,tid,&CLSID_FakeService,&equal); + ok(SUCCEEDED(hr),"ITfCategoryMgr_IsEqualTfGuidAtom failed\n"); + todo_wine ok(equal == TRUE,"Equal value invalid\n"); + hr = ITfCategoryMgr_GetGUID(g_cm,cid,&g1); + ok(SUCCEEDED(hr),"ITfCategoryMgr_GetGUID failed\n"); + todo_wine ok(!IsEqualGUID(&g1,&GUID_NULL),"guid should not be NULL\n"); +} + START_TEST(inputprocessor) { if (SUCCEEDED(initialize())) @@ -620,6 +659,7 @@ START_TEST(inputprocessor) test_ThreadMgrAdviseSinks(); test_Activate(); test_startSession(); + test_TfGuidAtom(); test_KeystrokeMgr(); test_endSession(); test_EnumLanguageProfiles();

1 0

Paul TBBle Hampson : gdi32: Fetch child fonts by real parent font name.
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: 8a4b77883e4ddcd2160a1e05da17ac459b793b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a4b77883e4ddcd2160a1e05d… Author: Paul TBBle Hampson <Paul.Hampson(a)Pobox.com> Date: Tue Apr 14 22:20:55 2009 +1000 gdi32: Fetch child fonts by real parent font name. Entries in the list of linked fonts are keyed by the substituted font name, so need to be looked up by the substituted font name. --- dlls/gdi32/freetype.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 2f2c63e..2e088b8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3194,10 +3194,14 @@ static BOOL create_child_font_list(GdiFont *font) BOOL ret = FALSE; SYSTEM_LINKS *font_link; CHILD_FONT *font_link_entry, *new_child; + FontSubst *psub; + WCHAR* font_name; + psub = get_font_subst(&font_subst_list, font->name, -1); + font_name = psub ? psub->to.name : font->name; LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) { - if(!strcmpiW(font_link->font_name, font->name)) + if(!strcmpiW(font_link->font_name, font_name)) { TRACE("found entry in system list\n"); LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) @@ -3218,7 +3222,7 @@ static BOOL create_child_font_list(GdiFont *font) */ if (use_default_fallback && font->charset != SYMBOL_CHARSET && font->charset != OEM_CHARSET && - strcmpiW(font->name,szDefaultFallbackLink) != 0) + strcmpiW(font_name,szDefaultFallbackLink) != 0) LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) { if(!strcmpiW(font_link->font_name,szDefaultFallbackLink))

1 0

Paul TBBle Hampson : gdi32: Don' t add system_links entries for substituted fonts.
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: ce426d6ad129c34161f618e9a5ebc212c0f9684f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce426d6ad129c34161f618e9a… Author: Paul TBBle Hampson <Paul.Hampson(a)Pobox.com> Date: Mon May 4 23:21:27 2009 +1000 gdi32: Don't add system_links entries for substituted fonts. When a Font is looked up in the FontLinks table, they have already been normalised by FontSubstitutes. So no need to store system_links entries for fonts that appear as keys in the FontSubstitutes list. --- dlls/gdi32/freetype.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 2e088b8..7b0afa8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1652,9 +1652,15 @@ static BOOL init_system_links(void) while(RegEnumValueW(hkey, index++, value, &val_len, NULL, &type, (LPBYTE)data, &data_len) == ERROR_SUCCESS) { memset(&fs, 0, sizeof(fs)); - font_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*font_link)); psub = get_font_subst(&font_subst_list, value, -1); - font_link->font_name = (psub)? strdupW(psub->to.name) : strdupW(value); + /* Don't store fonts that are only substitutes for other fonts */ + if(psub) + { + TRACE("%s: SystemLink entry for substituted font, ignoring\n", debugstr_w(value)); + continue; + } + font_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*font_link)); + font_link->font_name = strdupW(value); list_init(&font_link->links); for(entry = data; (char*)entry < (char*)data + data_len && *entry != 0; entry = next) {

1 0

Austin English : t2embed: Add stub dll.
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: b03d07dff4d710d9176602a7d939c94bf7dd89ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=b03d07dff4d710d9176602a7d… Author: Austin English <austinenglish(a)gmail.com> Date: Mon May 4 22:52:37 2009 -0500 t2embed: Add stub dll. --- configure | 9 +++++++++ configure.ac | 1 + dlls/t2embed/Makefile.in | 13 +++++++++++++ dlls/t2embed/main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/t2embed/t2embed.spec | 25 +++++++++++++++++++++++++ 5 files changed, 91 insertions(+), 0 deletions(-) diff --git a/configure b/configure index a44b1ca..ce18e5c 100755 --- a/configure +++ b/configure @@ -27054,6 +27054,14 @@ dlls/sxs/Makefile: dlls/sxs/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/sxs/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/t2embed/Makefile" +test "x$enable_t2embed" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + t2embed" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/t2embed/Makefile: dlls/t2embed/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/t2embed/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/tapi32/Makefile" test "x$enable_tapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ tapi32" @@ -29277,6 +29285,7 @@ do "dlls/strmiids/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/strmiids/Makefile" ;; "dlls/svrapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/svrapi/Makefile" ;; "dlls/sxs/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sxs/Makefile" ;; + "dlls/t2embed/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/t2embed/Makefile" ;; "dlls/tapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/tapi32/Makefile" ;; "dlls/traffic/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/traffic/Makefile" ;; "dlls/twain.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain.dll16/Makefile" ;; diff --git a/configure.ac b/configure.ac index 322b6e9..5f8b86f 100644 --- a/configure.ac +++ b/configure.ac @@ -2227,6 +2227,7 @@ WINE_CONFIG_MAKEFILE([dlls/stress.dll16/Makefile],[dlls/Makedll.rules],[dlls],[A WINE_CONFIG_MAKEFILE([dlls/strmiids/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS]) WINE_CONFIG_MAKEFILE([dlls/svrapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/sxs/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/t2embed/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/tapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/traffic/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/twain.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) diff --git a/dlls/t2embed/Makefile.in b/dlls/t2embed/Makefile.in new file mode 100644 index 0000000..3445c0c --- /dev/null +++ b/dlls/t2embed/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = t2embed.dll +IMPORTS = kernel32 + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c new file mode 100644 index 0000000..8962248 --- /dev/null +++ b/dlls/t2embed/main.c @@ -0,0 +1,43 @@ +/* + * + * Copyright 2009 Austin English + * + * 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 + */ + + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/t2embed/t2embed.spec b/dlls/t2embed/t2embed.spec new file mode 100644 index 0000000..ed0c71f --- /dev/null +++ b/dlls/t2embed/t2embed.spec @@ -0,0 +1,25 @@ +@ stub TTCharToUnicode +@ stub TTDeleteEmbeddedFont +@ stub TTEmbedFont +@ stub TTEmbedFontFromFileA +@ stub TTEnableEmbeddingForFacename +@ stub TTGetEmbeddedFontInfo +@ stub TTGetEmbeddingType +@ stub TTIsEmbeddingEnabled +@ stub TTIsEmbeddingEnabledForFacename +@ stub TTLoadEmbeddedFont +@ stub TTRunValidationTests +@ stub _TTCharToUnicode(a)24 +@ stub _TTDeleteEmbeddedFont(a)12 +@ stub _TTEmbedFont(a)44 +@ stub _TTEmbedFontFromFileA(a)52 +@ stub _TTEnableEmbeddingForFacename(a)8 +@ stub _TTGetEmbeddedFontInfo(a)28 +@ stub _TTGetEmbeddingType(a)8 +@ stub _TTIsEmbeddingEnabled(a)8 +@ stub _TTIsEmbeddingEnabledForFacename(a)8 +@ stub _TTLoadEmbeddedFont(a)40 +@ stub _TTRunValidationTests(a)8 +@ stub TTEmbedFontEx +@ stub TTRunValidationTestsEx +@ stub TTGetNewFontName

1 0

Marcus Meissner : msi: Initialize info and patch variables (Coverity 923).
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: 1cfc88a50076ecdf2b44c087c5ddbd12d38271cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cfc88a50076ecdf2b44c087c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue May 5 00:28:16 2009 +0200 msi: Initialize info and patch variables (Coverity 923). --- dlls/msi/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 43436bd..58a1856 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -303,7 +303,7 @@ done: static UINT MSI_ApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szProductCode, LPCWSTR szCommandLine) { - MSIHANDLE patch, info; + MSIHANDLE patch = 0, info = 0; UINT r, type; DWORD size = 0; LPCWSTR cmd_ptr = szCommandLine;

1 0

Nicolas Le Cam : user32/tests: Fix scroll tests when theming is disabled.
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: ffba5470c0bd20e6149895838fa5b29fd1115b78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffba5470c0bd20e6149895838… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Mon May 4 23:49:14 2009 +0200 user32/tests: Fix scroll tests when theming is disabled. --- dlls/user32/tests/scroll.c | 43 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 6082d6f..55fb6f6 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -26,6 +26,7 @@ #include "wine/test.h" static HWND hScroll, hMainWnd; +static BOOL bThemeActive = FALSE; static LRESULT CALLBACK MyWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ) { @@ -277,11 +278,18 @@ todo_wine /* report the windows style */ winstyle = GetWindowLongW( hwnd, GWL_STYLE ); /* WS_VSCROLL added to the window style */ -todo_wine if( !(style & WS_VSCROLL)) - ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_VSCROLL), - "unexpected style change %8lx expected %8lx\n", - (winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_VSCROLL); + { + if (bThemeActive || style != WS_HSCROLL) +todo_wine + ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_VSCROLL), + "unexpected style change %8lx expected %8lx\n", + (winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_VSCROLL); + else + ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style, + "unexpected style change %8lx expected %8x\n", + (winstyle & (WS_HSCROLL|WS_VSCROLL)), style); + } /* do the test again with H and V reversed. * Start with a clean window */ DestroyWindow( hwnd); @@ -308,11 +316,18 @@ todo_wine /* report the windows style */ winstyle = GetWindowLongW( hwnd, GWL_STYLE ); /* WS_HSCROLL added to the window style */ -todo_wine if( !(style & WS_HSCROLL)) - ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_HSCROLL), - "unexpected style change %8lx expected %8lx\n", - (winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_HSCROLL); + { + if (bThemeActive || style != WS_VSCROLL) +todo_wine + ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == ( style | WS_HSCROLL), + "unexpected style change %8lx expected %8lx\n", + (winstyle & (WS_HSCROLL|WS_VSCROLL)), style | WS_HSCROLL); + else + ok( (winstyle & (WS_HSCROLL|WS_VSCROLL)) == style, + "unexpected style change %8lx expected %8x\n", + (winstyle & (WS_HSCROLL|WS_VSCROLL)), style); + } /* Slightly change the test to use SetScrollInfo * Start with a clean window */ DestroyWindow( hwnd); @@ -369,6 +384,8 @@ todo_wine START_TEST ( scroll ) { WNDCLASSA wc; + HMODULE hUxtheme; + BOOL (WINAPI * pIsThemeActive)(VOID); wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0; @@ -396,6 +413,16 @@ START_TEST ( scroll ) scrollbar_test3(); scrollbar_test4(); + /* Some test results vary depending of theming being active or not */ + hUxtheme = LoadLibraryA("uxtheme.dll"); + if (hUxtheme) + { + pIsThemeActive = (void*)GetProcAddress(hUxtheme, "IsThemeActive"); + if (pIsThemeActive) + bThemeActive = pIsThemeActive(); + FreeLibrary(hUxtheme); + } + scrollbar_test_default( 0); scrollbar_test_default( WS_HSCROLL); scrollbar_test_default( WS_VSCROLL);

1 0

Nikolay Sivov : comctl32/listview: Use handlers instead of sending messages to oneself.
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: e7537418d9b583eb731bf820f8b613559ad46f32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7537418d9b583eb731bf820f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue May 5 00:16:16 2009 +0400 comctl32/listview: Use handlers instead of sending messages to oneself. --- dlls/comctl32/listview.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 0f163ef..b76da63 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6232,7 +6232,7 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF while (nItem >= 0) { nItem--; - if ((ListView_GetItemState(infoPtr->hwndSelf, nItem, uMask) & uMask) == uMask) + if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask) return nItem; } } @@ -6252,10 +6252,10 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF } lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_UP; - SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt ); - while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1) + LISTVIEW_GetItemPosition(infoPtr, nItem, &lvFindInfo.pt); + while ((nItem = LISTVIEW_FindItemW(infoPtr, nItem, &lvFindInfo)) != -1) { - if ((ListView_GetItemState(infoPtr->hwndSelf, nItem, uMask) & uMask) == uMask) + if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask) return nItem; } } @@ -6287,8 +6287,8 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF } lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_DOWN; - SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt ); - while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1) + LISTVIEW_GetItemPosition(infoPtr, nItem, &lvFindInfo.pt); + while ((nItem = LISTVIEW_FindItemW(infoPtr, nItem, &lvFindInfo)) != -1) { if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask) return nItem; @@ -6323,10 +6323,10 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF } lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_LEFT; - SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt ); - while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1) + LISTVIEW_GetItemPosition(infoPtr, nItem, &lvFindInfo.pt); + while ((nItem = LISTVIEW_FindItemW(infoPtr, nItem, &lvFindInfo)) != -1) { - if ((ListView_GetItemState(infoPtr->hwndSelf, nItem, uMask) & uMask) == uMask) + if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask) return nItem; } } @@ -6339,7 +6339,7 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF while (nItem + nCountPerColumn < infoPtr->nItemCount) { nItem += nCountPerColumn; - if ((ListView_GetItemState(infoPtr->hwndSelf, nItem, uMask) & uMask) == uMask) + if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask) return nItem; } } @@ -6359,8 +6359,8 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF } lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_RIGHT; - SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt ); - while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1) + LISTVIEW_GetItemPosition(infoPtr, nItem, &lvFindInfo.pt); + while ((nItem = LISTVIEW_FindItemW(infoPtr, nItem, &lvFindInfo)) != -1) { if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask) return nItem; @@ -8626,19 +8626,19 @@ static LRESULT LISTVIEW_KeyDown(LISTVIEW_INFO *infoPtr, INT nVirtualKey, LONG lK break; case VK_LEFT: - nItem = ListView_GetNextItem(infoPtr->hwndSelf, infoPtr->nFocusedItem, LVNI_TOLEFT); + nItem = LISTVIEW_GetNextItem(infoPtr, infoPtr->nFocusedItem, LVNI_TOLEFT); break; case VK_UP: - nItem = ListView_GetNextItem(infoPtr->hwndSelf, infoPtr->nFocusedItem, LVNI_ABOVE); + nItem = LISTVIEW_GetNextItem(infoPtr, infoPtr->nFocusedItem, LVNI_ABOVE); break; case VK_RIGHT: - nItem = ListView_GetNextItem(infoPtr->hwndSelf, infoPtr->nFocusedItem, LVNI_TORIGHT); + nItem = LISTVIEW_GetNextItem(infoPtr, infoPtr->nFocusedItem, LVNI_TORIGHT); break; case VK_DOWN: - nItem = ListView_GetNextItem(infoPtr->hwndSelf, infoPtr->nFocusedItem, LVNI_BELOW); + nItem = LISTVIEW_GetNextItem(infoPtr, infoPtr->nFocusedItem, LVNI_BELOW); break; case VK_PRIOR:

1 0

Stefan Dösinger : wined3d: Implement texldd.
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: f5e24f7a85a4e3d296b4ad62d1a438dc156d8659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e24f7a85a4e3d296b4ad62d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 3 20:38:09 2009 +0200 wined3d: Implement texldd. GL_ARB_shader_texture is supported on dx9 ATI cards(and probably dx10 ones too). For Nvidia cards I included a fallback to normal texld. GL_EXT_gpu_shader4 supports similar texture*Grad GLSL functions, just with an EXT prefix instead of ARB. For dx9 NV cards we'd have to use GL_NV_fragment_program2, which supports a texldd equivalent on those cards. --- dlls/wined3d/baseshader.c | 4 ++ dlls/wined3d/directx.c | 1 + dlls/wined3d/glsl_shader.c | 88 ++++++++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 78 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5e24f7a85a4e3d296b4a…

1 0