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

Vit Hrachovy : wine-website:added Wine Solaris packages links
by Jeremy Newman May 6, 2009

May 6, 2009

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

Paul TBBle Hampson : gdi32: Don' t add system_links entries for substituted fonts.
by Alexandre Julliard May 5, 2009

May 5, 2009

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

Aric Stewart : msctf: Implement ITfCategoryMgr::RegisterGUID, ITfCategoryMgr::GetGUID and ITfCategoryMgr::IsEqualTfGuidAtom.
by Alexandre Julliard May 5, 2009

May 5, 2009

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

Alexandre Julliard : user32: Make sure the system params DC cannot be deleted.
by Alexandre Julliard May 5, 2009

May 5, 2009

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

Austin English : t2embed: Add stub dll.
by Alexandre Julliard May 5, 2009

May 5, 2009

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

Paul TBBle Hampson : gdi32: Fetch child fonts by real parent font name.
by Alexandre Julliard May 5, 2009

May 5, 2009

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

Alexandre Julliard : winex11: Limit window dimensions to 65535 to avoid 16-bit truncation issues.
by Alexandre Julliard May 5, 2009

May 5, 2009

Module: wine Branch: master Commit: a4644f126b79c9501592b499ea8b9ed53767598c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4644f126b79c9501592b499e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 5 15:36:25 2009 +0200 winex11: Limit window dimensions to 65535 to avoid 16-bit truncation issues. --- dlls/winex11.drv/window.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 8eccfe1..56f99cb 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -334,7 +334,9 @@ static Window create_client_window( Display *display, struct x11drv_win_data *da mask = CWEventMask | CWBitGravity | CWWinGravity | CWBackingStore; if ((cx = data->client_rect.right - data->client_rect.left) <= 0) cx = 1; + else if (cx > 65535) cx = 65535; if ((cy = data->client_rect.bottom - data->client_rect.top) <= 0) cy = 1; + else if (cy > 65535) cy = 65535; wine_tsx11_lock(); @@ -711,11 +713,13 @@ static int get_window_changes( XWindowChanges *changes, const RECT *old, const R if (old->right - old->left != new->right - new->left ) { if ((changes->width = new->right - new->left) <= 0) changes->width = 1; + else if (changes->width > 65535) changes->width = 65535; mask |= CWWidth; } if (old->bottom - old->top != new->bottom - new->top) { if ((changes->height = new->bottom - new->top) <= 0) changes->height = 1; + else if (changes->height > 65535) changes->height = 65535; mask |= CWHeight; } if (old->left != new->left) @@ -1289,6 +1293,8 @@ static void sync_window_position( Display *display, struct x11drv_win_data *data changes.height = data->whole_rect.bottom - data->whole_rect.top; /* if window rect is empty force size to 1x1 */ if (changes.width <= 0 || changes.height <= 0) changes.width = changes.height = 1; + if (changes.width > 65535) changes.width = 65535; + if (changes.height > 65535) changes.height = 65535; mask |= CWWidth | CWHeight; } @@ -1438,7 +1444,9 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat DWORD layered_flags; if (!(cx = data->window_rect.right - data->window_rect.left)) cx = 1; + else if (cx > 65535) cx = 65535; if (!(cy = data->window_rect.bottom - data->window_rect.top)) cy = 1; + else if (cy > 65535) cy = 65535; if (!data->managed && is_window_managed( data->hwnd, SWP_NOACTIVATE, &data->window_rect )) {

1 0

Hans Leidekker : ole32: Use existing MTA in CoGetClassObject and CoCreateInstance.
by Alexandre Julliard May 5, 2009

May 5, 2009

Module: wine Branch: master Commit: bd4975acb0b682bbf2b4934d12f942ea629f5bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd4975acb0b682bbf2b4934d1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 5 12:49:17 2009 +0200 ole32: Use existing MTA in CoGetClassObject and CoCreateInstance. Custom actions in the CS3 installer depend on this. --- dlls/ole32/compobj.c | 56 +++++++++++++++++++++++++++++++++++++++---- dlls/ole32/tests/compobj.c | 4 +- 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 4a57009..4440d77 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -493,6 +493,31 @@ static APARTMENT *apartment_findmain(void) return result; } +/* gets the multi-threaded apartment if it exists. The caller must + * release the reference from the apartment as soon as the apartment pointer + * is no longer required. */ +static APARTMENT *apartment_find_multi_threaded(void) +{ + APARTMENT *result = NULL; + struct list *cursor; + + EnterCriticalSection(&csApartment); + + LIST_FOR_EACH( cursor, &apts ) + { + struct apartment *apt = LIST_ENTRY( cursor, struct apartment, entry ); + if (apt->multi_threaded) + { + result = apt; + apartment_addref(result); + break; + } + } + + LeaveCriticalSection(&csApartment); + return result; +} + struct host_object_params { HKEY hkeydll; @@ -2237,6 +2262,7 @@ HRESULT WINAPI CoGetClassObject( LPUNKNOWN regClassObject; HRESULT hres = E_UNEXPECTED; APARTMENT *apt; + BOOL release_apt = FALSE; TRACE("\n\tCLSID:\t%s,\n\tIID:\t%s\n", debugstr_guid(rclsid), debugstr_guid(iid)); @@ -2245,11 +2271,14 @@ HRESULT WINAPI CoGetClassObject( *ppv = NULL; - apt = COM_CurrentApt(); - if (!apt) + if (!(apt = COM_CurrentApt())) { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; + if (!(apt = apartment_find_multi_threaded())) + { + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; + } + release_apt = TRUE; } if (pServerInfo) { @@ -2273,7 +2302,7 @@ HRESULT WINAPI CoGetClassObject( * is good since we are not returning it in the "out" parameter. */ IUnknown_Release(regClassObject); - + if (release_apt) apartment_release(apt); return hres; } @@ -2284,7 +2313,10 @@ HRESULT WINAPI CoGetClassObject( HKEY hkey; if (IsEqualCLSID(rclsid, &CLSID_InProcFreeMarshaler)) + { + if (release_apt) apartment_release(apt); return FTMarshalCF_Create(iid, ppv); + } hres = COM_OpenKeyForCLSID(rclsid, wszInprocServer32, KEY_READ, &hkey); if (FAILED(hres)) @@ -2308,7 +2340,10 @@ HRESULT WINAPI CoGetClassObject( /* return if we got a class, otherwise fall through to one of the * other types */ if (SUCCEEDED(hres)) + { + if (release_apt) apartment_release(apt); return hres; + } } /* Next try in-process handler */ @@ -2339,8 +2374,12 @@ HRESULT WINAPI CoGetClassObject( /* return if we got a class, otherwise fall through to one of the * other types */ if (SUCCEEDED(hres)) + { + if (release_apt) apartment_release(apt); return hres; + } } + if (release_apt) apartment_release(apt); /* Next try out of process */ if (CLSCTX_LOCAL_SERVER & dwClsContext) @@ -2418,6 +2457,7 @@ HRESULT WINAPI CoCreateInstance( { HRESULT hres; LPCLASSFACTORY lpclf = 0; + APARTMENT *apt; TRACE("(rclsid=%s, pUnkOuter=%p, dwClsContext=%08x, riid=%s, ppv=%p)\n", debugstr_guid(rclsid), pUnkOuter, dwClsContext, debugstr_guid(iid), ppv); @@ -2433,10 +2473,14 @@ HRESULT WINAPI CoCreateInstance( */ *ppv = 0; - if (!COM_CurrentApt()) + if (!(apt = COM_CurrentApt())) { + if (!(apt = apartment_find_multi_threaded())) + { ERR("apartment not initialised\n"); return CO_E_NOTINITIALIZED; + } + apartment_release(apt); } /* diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 4dd0ace..7363f30 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -276,7 +276,7 @@ static void test_CoCreateInstance(void) pUnk = (IUnknown *)0xdeadbeef; hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); - todo_wine ok(hr == S_OK, "CoCreateInstance should have returned S_OK instead of 0x%08x\n", hr); + ok(hr == S_OK, "CoCreateInstance should have returned S_OK instead of 0x%08x\n", hr); if (pUnk) IUnknown_Release(pUnk); SetEvent(info.stop); @@ -325,7 +325,7 @@ static void test_CoGetClassObject(void) pUnk = (IUnknown *)0xdeadbeef; hr = CoGetClassObject(rclsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); - todo_wine ok(hr == S_OK, "CoGetClassObject should have returned S_OK instead of 0x%08x\n", hr); + ok(hr == S_OK, "CoGetClassObject should have returned S_OK instead of 0x%08x\n", hr); if (pUnk) IUnknown_Release(pUnk); SetEvent(info.stop);

1 0

Hans Leidekker : ole32: Add tests to show that COM needs to be initialized only once for multi-threaded apartments .
by Alexandre Julliard May 5, 2009

May 5, 2009

Module: wine Branch: master Commit: d2820c06845a3b40fde24f67a1416907463736ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2820c06845a3b40fde24f67a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 5 12:48:33 2009 +0200 ole32: Add tests to show that COM needs to be initialized only once for multi-threaded apartments. --- dlls/ole32/tests/compobj.c | 103 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 97 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index d0c6281..4dd0ace 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -218,11 +218,36 @@ static void test_StringFromGUID2(void) ok(len == 0, "len: %d (expected 0)\n", len); } +struct info +{ + HANDLE wait, stop; +}; + +static DWORD CALLBACK ole_initialize_thread(LPVOID pv) +{ + HRESULT hr; + struct info *info = pv; + + hr = pCoInitializeEx(NULL, COINIT_MULTITHREADED); + + SetEvent(info->wait); + WaitForSingleObject(info->stop, INFINITE); + + CoUninitialize(); + return hr; +} + static void test_CoCreateInstance(void) { - REFCLSID rclsid = &CLSID_MyComputer; - IUnknown *pUnk = (IUnknown *)0xdeadbeef; - HRESULT hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); + HRESULT hr; + HANDLE thread; + DWORD tid, exitcode; + IUnknown *pUnk; + struct info info; + REFCLSID rclsid = &CLSID_InternetZoneManager; + + pUnk = (IUnknown *)0xdeadbeef; + hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); ok(hr == CO_E_NOTINITIALIZED, "CoCreateInstance should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); ok(pUnk == NULL, "CoCreateInstance should have changed the passed in pointer to NULL, instead of %p\n", pUnk); @@ -234,19 +259,85 @@ static void test_CoCreateInstance(void) hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); ok(hr == CO_E_NOTINITIALIZED, "CoCreateInstance should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); + + /* show that COM doesn't have to be initialized for multi-threaded apartments if another + thread has already done so */ + + info.wait = CreateEvent(NULL, TRUE, FALSE, NULL); + ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); + + info.stop = CreateEvent(NULL, TRUE, FALSE, NULL); + ok(info.stop != NULL, "CreateEvent failed with error %d\n", GetLastError()); + + thread = CreateThread(NULL, 0, ole_initialize_thread, &info, 0, &tid); + ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); + + WaitForSingleObject(info.wait, INFINITE); + + pUnk = (IUnknown *)0xdeadbeef; + hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); + todo_wine ok(hr == S_OK, "CoCreateInstance should have returned S_OK instead of 0x%08x\n", hr); + if (pUnk) IUnknown_Release(pUnk); + + SetEvent(info.stop); + WaitForSingleObject(thread, INFINITE); + + GetExitCodeThread(thread, &exitcode); + hr = exitcode; + ok(hr == S_OK, "thread should have returned S_OK instead of 0x%08x\n", hr); + + CloseHandle(thread); + CloseHandle(info.wait); + CloseHandle(info.stop); } static void test_CoGetClassObject(void) { - IUnknown *pUnk = (IUnknown *)0xdeadbeef; - HRESULT hr = CoGetClassObject(&CLSID_MyComputer, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); + HRESULT hr; + HANDLE thread; + DWORD tid, exitcode; + IUnknown *pUnk; + struct info info; + REFCLSID rclsid = &CLSID_InternetZoneManager; + + hr = CoGetClassObject(rclsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); ok(hr == CO_E_NOTINITIALIZED, "CoGetClassObject should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); ok(pUnk == NULL, "CoGetClassObject should have changed the passed in pointer to NULL, instead of %p\n", pUnk); - hr = CoGetClassObject(&CLSID_MyComputer, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, NULL); + hr = CoGetClassObject(rclsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, NULL); ok(hr == E_INVALIDARG || broken(hr == CO_E_NOTINITIALIZED), /* win9x */ "CoGetClassObject should have returned E_INVALIDARG instead of 0x%08x\n", hr); + + /* show that COM doesn't have to be initialized for multi-threaded apartments if another + thread has already done so */ + + info.wait = CreateEvent(NULL, TRUE, FALSE, NULL); + ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); + + info.stop = CreateEvent(NULL, TRUE, FALSE, NULL); + ok(info.stop != NULL, "CreateEvent failed with error %d\n", GetLastError()); + + thread = CreateThread(NULL, 0, ole_initialize_thread, &info, 0, &tid); + ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); + + WaitForSingleObject(info.wait, INFINITE); + + pUnk = (IUnknown *)0xdeadbeef; + hr = CoGetClassObject(rclsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); + todo_wine ok(hr == S_OK, "CoGetClassObject should have returned S_OK instead of 0x%08x\n", hr); + if (pUnk) IUnknown_Release(pUnk); + + SetEvent(info.stop); + WaitForSingleObject(thread, INFINITE); + + GetExitCodeThread(thread, &exitcode); + hr = exitcode; + ok(hr == S_OK, "thread should have returned S_OK instead of 0x%08x\n", hr); + + CloseHandle(thread); + CloseHandle(info.wait); + CloseHandle(info.stop); } static ATOM register_dummy_class(void)

1 0

Michael Stefaniuc : notepad: Use the explicit SendMessageW form.
by Alexandre Julliard May 5, 2009

May 5, 2009

Module: wine Branch: master Commit: 0c702d140c77b91b9fdf429e80acf05454a0d4ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c702d140c77b91b9fdf429e8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 5 12:18:43 2009 +0200 notepad: Use the explicit SendMessageW form. --- programs/notepad/dialog.c | 42 +++++++++++++++++++++--------------------- programs/notepad/main.c | 26 +++++++++++++------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 0abbc33..8a3389b 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -160,7 +160,7 @@ static VOID DoSaveFile(VOID) if (!WriteFile(hFile, pTemp, size, &dwNumWrite, NULL)) ShowLastError(); else - SendMessage(Globals.hEdit, EM_SETMODIFY, FALSE, 0); + SendMessageW(Globals.hEdit, EM_SETMODIFY, FALSE, 0); SetEndOfFile(hFile); CloseHandle(hFile); @@ -177,7 +177,7 @@ BOOL DoCloseFile(void) int nResult; static const WCHAR empty_strW[] = { 0 }; - if (SendMessage(Globals.hEdit, EM_GETMODIFY, 0, 0)) + if (SendMessageW(Globals.hEdit, EM_GETMODIFY, 0, 0)) { /* prompt user to save changes */ nResult = AlertFileNotSaved(Globals.szFileName); @@ -255,18 +255,18 @@ void DoOpenFile(LPCWSTR szFileName) HeapFree(GetProcessHeap(), 0, pTemp); - SendMessage(Globals.hEdit, EM_SETMODIFY, FALSE, 0); - SendMessage(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0); + SendMessageW(Globals.hEdit, EM_SETMODIFY, FALSE, 0); + SendMessageW(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0); SetFocus(Globals.hEdit); /* If the file starts with .LOG, add a time/date at the end and set cursor after */ if (GetWindowTextW(Globals.hEdit, log, sizeof(log)/sizeof(log[0])) && !lstrcmp(log, dotlog)) { static const WCHAR lfW[] = { '\r','\n',0 }; - SendMessage(Globals.hEdit, EM_SETSEL, GetWindowTextLength(Globals.hEdit), -1); - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)lfW); + SendMessageW(Globals.hEdit, EM_SETSEL, GetWindowTextLength(Globals.hEdit), -1); + SendMessageW(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)lfW); DIALOG_EditTimeDate(); - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)lfW); + SendMessageW(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)lfW); } SetFileName(szFileName); @@ -280,7 +280,7 @@ VOID DIALOG_FileNew(VOID) /* Close any files and prompt to save changes */ if (DoCloseFile()) { SetWindowText(Globals.hEdit, empty_strW); - SendMessage(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0); + SendMessageW(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0); SetFocus(Globals.hEdit); } } @@ -618,32 +618,32 @@ VOID DIALOG_FileExit(VOID) VOID DIALOG_EditUndo(VOID) { - SendMessage(Globals.hEdit, EM_UNDO, 0, 0); + SendMessageW(Globals.hEdit, EM_UNDO, 0, 0); } VOID DIALOG_EditCut(VOID) { - SendMessage(Globals.hEdit, WM_CUT, 0, 0); + SendMessageW(Globals.hEdit, WM_CUT, 0, 0); } VOID DIALOG_EditCopy(VOID) { - SendMessage(Globals.hEdit, WM_COPY, 0, 0); + SendMessageW(Globals.hEdit, WM_COPY, 0, 0); } VOID DIALOG_EditPaste(VOID) { - SendMessage(Globals.hEdit, WM_PASTE, 0, 0); + SendMessageW(Globals.hEdit, WM_PASTE, 0, 0); } VOID DIALOG_EditDelete(VOID) { - SendMessage(Globals.hEdit, WM_CLEAR, 0, 0); + SendMessageW(Globals.hEdit, WM_CLEAR, 0, 0); } VOID DIALOG_EditSelectAll(VOID) { - SendMessage(Globals.hEdit, EM_SETSEL, 0, (LPARAM)-1); + SendMessageW(Globals.hEdit, EM_SETSEL, 0, -1); } VOID DIALOG_EditTimeDate(VOID) @@ -655,12 +655,12 @@ VOID DIALOG_EditTimeDate(VOID) GetLocalTime(&st); GetTimeFormat(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &st, NULL, szDate, MAX_STRING_LEN); - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate); + SendMessageW(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate); - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)spaceW); + SendMessageW(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)spaceW); GetDateFormat(LOCALE_USER_DEFAULT, 0, &st, NULL, szDate, MAX_STRING_LEN); - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate); + SendMessageW(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate); } VOID DIALOG_EditWrap(VOID) @@ -681,16 +681,16 @@ VOID DIALOG_EditWrap(VOID) return; } GetWindowText(Globals.hEdit, pTemp, size); - modify = SendMessage(Globals.hEdit, EM_GETMODIFY, 0, 0); + modify = SendMessageW(Globals.hEdit, EM_GETMODIFY, 0, 0); DestroyWindow(Globals.hEdit); GetClientRect(Globals.hMainWnd, &rc); if( Globals.bWrapLongLines ) dwStyle |= WS_HSCROLL | ES_AUTOHSCROLL; Globals.hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, editW, NULL, dwStyle, 0, 0, rc.right, rc.bottom, Globals.hMainWnd, NULL, Globals.hInstance, NULL); - SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)FALSE); + SendMessageW(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, FALSE); SetWindowTextW(Globals.hEdit, pTemp); - SendMessage(Globals.hEdit, EM_SETMODIFY, (WPARAM)modify, 0); + SendMessageW(Globals.hEdit, EM_SETMODIFY, modify, 0); SetFocus(Globals.hEdit); HeapFree(GetProcessHeap(), 0, pTemp); @@ -716,7 +716,7 @@ VOID DIALOG_SelectFont(VOID) Globals.hFont=CreateFontIndirect( &lf ); Globals.lfFont=lf; - SendMessage( Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)TRUE ); + SendMessageW( Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, TRUE ); if( currfont!=NULL ) DeleteObject( currfont ); } diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 33b4859..5d462a0 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -343,10 +343,10 @@ static VOID NOTEPAD_InitMenuPopup(HMENU menu, int index) int enable; EnableMenuItem(menu, CMD_UNDO, - SendMessage(Globals.hEdit, EM_CANUNDO, 0, 0) ? MF_ENABLED : MF_GRAYED); + SendMessageW(Globals.hEdit, EM_CANUNDO, 0, 0) ? MF_ENABLED : MF_GRAYED); EnableMenuItem(menu, CMD_PASTE, IsClipboardFormatAvailable(CF_TEXT) ? MF_ENABLED : MF_GRAYED); - enable = SendMessage(Globals.hEdit, EM_GETSEL, 0, 0); + enable = SendMessageW(Globals.hEdit, EM_GETSEL, 0, 0); enable = (HIWORD(enable) == LOWORD(enable)) ? MF_GRAYED : MF_ENABLED; EnableMenuItem(menu, CMD_CUT, enable); EnableMenuItem(menu, CMD_COPY, enable); @@ -385,7 +385,7 @@ void NOTEPAD_DoFind(FINDREPLACE *fr) if (!content) return; GetWindowText(Globals.hEdit, content, fileLen); - SendMessage(Globals.hEdit, EM_GETSEL, 0, (LPARAM)&pos); + SendMessageW(Globals.hEdit, EM_GETSEL, 0, (LPARAM)&pos); switch (fr->Flags & (FR_DOWN|FR_MATCHCASE)) { case 0: @@ -412,7 +412,7 @@ void NOTEPAD_DoFind(FINDREPLACE *fr) return; } - SendMessage(Globals.hEdit, EM_SETSEL, found - content, found - content + len); + SendMessageW(Globals.hEdit, EM_SETSEL, found - content, found - content + len); } void NOTEPAD_DoReplace(FINDREPLACE *fr) @@ -428,16 +428,16 @@ void NOTEPAD_DoReplace(FINDREPLACE *fr) if (!content) return; GetWindowText(Globals.hEdit, content, fileLen); - SendMessage(Globals.hEdit, EM_GETSEL, (WPARAM)&pos_start, (LPARAM)&pos); + SendMessageW(Globals.hEdit, EM_GETSEL, (WPARAM)&pos_start, (LPARAM)&pos); switch (fr->Flags & (FR_DOWN|FR_MATCHCASE)) { case FR_DOWN: if ( pos-pos_start == len && StrCmpNI(fr->lpstrFindWhat, content+pos_start, len) == 0) - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)fr->lpstrReplaceWith); + SendMessageW(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)fr->lpstrReplaceWith); break; case FR_DOWN|FR_MATCHCASE: if ( pos-pos_start == len && StrCmpN(fr->lpstrFindWhat, content+pos_start, len) == 0) - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)fr->lpstrReplaceWith); + SendMessageW(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)fr->lpstrReplaceWith); break; default: /* shouldn't happen */ return; @@ -455,14 +455,14 @@ void NOTEPAD_DoReplaceAll(FINDREPLACE *fr) int fileLen; DWORD pos; - SendMessage(Globals.hEdit, EM_SETSEL, 0, 0); + SendMessageW(Globals.hEdit, EM_SETSEL, 0, 0); while(TRUE){ fileLen = GetWindowTextLength(Globals.hEdit) + 1; content = HeapAlloc(GetProcessHeap(), 0, fileLen * sizeof(TCHAR)); if (!content) return; GetWindowText(Globals.hEdit, content, fileLen); - SendMessage(Globals.hEdit, EM_GETSEL, 0, (LPARAM)&pos); + SendMessageW(Globals.hEdit, EM_GETSEL, 0, (LPARAM)&pos); switch (fr->Flags & (FR_DOWN|FR_MATCHCASE)) { case FR_DOWN: @@ -478,11 +478,11 @@ void NOTEPAD_DoReplaceAll(FINDREPLACE *fr) if(found == NULL) { - SendMessage(Globals.hEdit, EM_SETSEL, 0, 0); + SendMessageW(Globals.hEdit, EM_SETSEL, 0, 0); return; } - SendMessage(Globals.hEdit, EM_SETSEL, found - content, found - content + len); - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)fr->lpstrReplaceWith); + SendMessageW(Globals.hEdit, EM_SETSEL, found - content, found - content + len); + SendMessageW(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)fr->lpstrReplaceWith); } } @@ -535,7 +535,7 @@ static LRESULT WINAPI NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, NULL, Globals.hInstance, NULL); Globals.hFont = CreateFontIndirect(&Globals.lfFont); - SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)FALSE); + SendMessageW(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, FALSE); break; }

1 0