October 2008 - Wine-devel - list.winehq.org

Re: actxprxy/qmgrprxy: Specify dlldata.c in C_SRCS instead of in EXTRA_OBJS to allow dependencies to be generated.
by Alexandre Julliard 09 Oct '08

09 Oct '08

"Rob Shearman" <robertshearman(a)gmail.com> writes: > @@ -6,9 +6,9 @@ MODULE = actxprxy.dll > IMPORTS = rpcrt4 kernel32 ntdll > EXTRADEFS = -DREGISTER_PROXY_DLL -DPROXY_CLSID_IS="{ 0xb8da6310, 0xe19b, 0x11d0, { 0x93, 0x3c, 0x00, 0xa0, 0xc9, 0x0d, 0xca, 0xa9 } }" > > -EXTRA_OBJS = dlldata.o > - > +# Note: dlldata.c is auto-generated > C_SRCS = \ > + dlldata.c \ > usrmarshal.c This is wrong, C_SRCS is for source files only. Dependencies for dlldata.c are already generated automatically anyway. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: oleacc: implemented GetRoleText[A/W] with tests (try6 - rebased)
by Nikolay Sivov 09 Oct '08

09 Oct '08

On Tue, 2008-10-07 at 21:23 +0400, Nikolay Sivov wrote: > Changelog(try5, try6): > - rebased with current git > Changelog(try4): > - tests for string length added > - configure.ac in the same patch > Changelog: > - implemented GetRoleText[A/W] with tests > > >From 82eeac4de0a082b3c665d9f46a84fa634d847b91 Mon Sep 17 00:00:00 2001 > From: Nikolay Sivov <bunglehead(a)gmail.com> > Date: Tue, 7 Oct 2008 21:10:37 +0400 > Subject: Impl. GetRoleText[A/W] > > --- > configure.ac | 1 + > dlls/oleacc/Makefile.in | 4 +- > dlls/oleacc/main.c | 74 +++++++++++++++++++++++++ > dlls/oleacc/oleacc.rc | 24 ++++++++ > dlls/oleacc/oleacc.spec | 4 +- > dlls/oleacc/oleacc_En.rc | 90 ++++++++++++++++++++++++++++++ > dlls/oleacc/tests/Makefile.in | 13 +++++ > dlls/oleacc/tests/main.c | 121 +++++++++++++++++++++++++++++++++++++++++ > 8 files changed, 328 insertions(+), 3 deletions(-) > > diff --git a/configure.ac b/configure.ac > index dac47c6..e68ccf3 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1942,6 +1942,7 @@ WINE_CONFIG_MAKEFILE([dlls/odbccp32/tests/Makefile],[dlls/Maketest.rules],[dlls] > WINE_CONFIG_MAKEFILE([dlls/ole32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) > WINE_CONFIG_MAKEFILE([dlls/ole32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) > WINE_CONFIG_MAKEFILE([dlls/oleacc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) > +WINE_CONFIG_MAKEFILE([dlls/oleacc/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) > WINE_CONFIG_MAKEFILE([dlls/oleaut32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) > WINE_CONFIG_MAKEFILE([dlls/oleaut32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) > WINE_CONFIG_MAKEFILE([dlls/olecli32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) > diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in > index 5822916..882edcb 100644 > --- a/dlls/oleacc/Makefile.in > +++ b/dlls/oleacc/Makefile.in > @@ -4,11 +4,13 @@ SRCDIR = @srcdir@ > VPATH = @srcdir@ > MODULE = oleacc.dll > IMPORTLIB = oleacc > -IMPORTS = kernel32 > +IMPORTS = kernel32 user32 > > C_SRCS = \ > main.c > > +RC_SRCS = oleacc.rc > + > @MAKE_DLL_RULES@ > > @DEPENDENCIES@ # everything below this line is overwritten by make depend > diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c > index 9a6f765..5076e00 100644 > --- a/dlls/oleacc/main.c > +++ b/dlls/oleacc/main.c > @@ -24,10 +24,13 @@ > #include "winuser.h" > #include "ole2.h" > > +#include "wine/unicode.h" > #include "wine/debug.h" > > WINE_DEFAULT_DEBUG_CHANNEL(oleacc); > > +static HINSTANCE oleacc_handle = 0; > + > HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, > REFIID riidInterface, void** ppvObject ) > { > @@ -50,6 +53,21 @@ HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, > return E_NOTIMPL; > } > > +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, > + LPVOID lpvReserved) > +{ > + TRACE("%p, %d, %p\n", hinstDLL, fdwReason, lpvReserved); > + > + switch (fdwReason) > + { > + case DLL_PROCESS_ATTACH: > + oleacc_handle = hinstDLL; > + DisableThreadLibraryCalls(hinstDLL); > + break; > + } > + return TRUE; > +} > + > HRESULT WINAPI DllRegisterServer(void) > { > FIXME("\n"); > @@ -67,3 +85,59 @@ void WINAPI GetOleaccVersionInfo(DWORD* pVersion, DWORD* pBuild) > *pVersion = MAKELONG(2,4); /* Windows XP version of oleacc: 4.2.5406.0 */ > *pBuild = MAKELONG(0,5406); > } > + > +UINT WINAPI GetRoleTextW(DWORD role, LPWSTR lpRole, UINT rolemax) > +{ > + INT ret; > + WCHAR *resptr; > + > + TRACE("%u %p %u\n", role, lpRole, rolemax); > + > + /* return role text length */ > + if(!lpRole) > + return LoadStringW(oleacc_handle, role, (LPWSTR)&resptr, 0); > + > + ret = LoadStringW(oleacc_handle, role, lpRole, rolemax); > + if(!(ret > 0)){ > + if(rolemax > 0) lpRole[0] = '\0'; > + return 0; > + } > + > + return ret; > +} > + > +UINT WINAPI GetRoleTextA(DWORD role, LPSTR lpRole, UINT rolemax) > +{ > + UINT length; > + WCHAR *roletextW; > + > + TRACE("%u %p %u\n", role, lpRole, rolemax); > + > + length = GetRoleTextW(role, NULL, 0); > + if((length == 0) || (lpRole && !rolemax)) > + return 0; > + > + roletextW = HeapAlloc(GetProcessHeap(), 0, (length + 1)*sizeof(WCHAR)); > + if(!roletextW) > + return 0; > + > + GetRoleTextW(role, roletextW, length + 1); > + > + length = WideCharToMultiByte( CP_ACP, 0, roletextW, -1, NULL, 0, NULL, NULL ); > + > + if(!lpRole){ > + HeapFree(GetProcessHeap(), 0, roletextW); > + return length - 1; > + } > + > + WideCharToMultiByte( CP_ACP, 0, roletextW, -1, lpRole, rolemax, NULL, NULL ); > + > + if(rolemax < length){ > + lpRole[rolemax-1] = '\0'; > + length = rolemax; > + } > + > + HeapFree(GetProcessHeap(), 0, roletextW); > + > + return length - 1; > +} > diff --git a/dlls/oleacc/oleacc.rc b/dlls/oleacc/oleacc.rc > new file mode 100644 > index 0000000..0795a9b > --- /dev/null > +++ b/dlls/oleacc/oleacc.rc > @@ -0,0 +1,24 @@ > +/* > + * Top level resource file for oleacc > + * > + * Copyright 2008 Nikolay Sivov > + * > + * 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 "windef.h" > +#include "oleacc.h" > + > +#include "oleacc_En.rc" > diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec > index 23b84b3..75b743a 100644 > --- a/dlls/oleacc/oleacc.spec > +++ b/dlls/oleacc/oleacc.spec > @@ -8,8 +8,8 @@ > @ stdcall -private DllRegisterServer() > @ stdcall -private DllUnregisterServer() > @ stdcall GetOleaccVersionInfo(ptr ptr) > -@ stub GetRoleTextA > -@ stub GetRoleTextW > +@ stdcall GetRoleTextA(long ptr long) > +@ stdcall GetRoleTextW(long wstr long) > @ stub GetStateTextA > @ stub GetStateTextW > @ stub IID_IAccessible > diff --git a/dlls/oleacc/oleacc_En.rc b/dlls/oleacc/oleacc_En.rc > new file mode 100644 > index 0000000..992d29c > --- /dev/null > +++ b/dlls/oleacc/oleacc_En.rc > @@ -0,0 +1,90 @@ > +/* > + * English resources for oleacc > + * > + * Copyright 2008 Nikolay Sivov > + * > + * 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 > + */ > + > +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT > + > +STRINGTABLE DISCARDABLE > +{ > + 0 "unknown object" /* undocumented */ > + ROLE_SYSTEM_TITLEBAR "title bar" > + ROLE_SYSTEM_MENUBAR "menu bar" > + ROLE_SYSTEM_SCROLLBAR "scroll bar" > + ROLE_SYSTEM_GRIP "grip" > + ROLE_SYSTEM_SOUND "sound" > + ROLE_SYSTEM_CURSOR "cursor" > + ROLE_SYSTEM_CARET "caret" > + ROLE_SYSTEM_ALERT "alert" > + ROLE_SYSTEM_WINDOW "window" > + ROLE_SYSTEM_CLIENT "client" > + ROLE_SYSTEM_MENUPOPUP "popup menu" > + ROLE_SYSTEM_MENUITEM "menu item" > + ROLE_SYSTEM_TOOLTIP "tool tip" > + ROLE_SYSTEM_APPLICATION "application" > + ROLE_SYSTEM_DOCUMENT "document" > + ROLE_SYSTEM_PANE "pane" > + ROLE_SYSTEM_CHART "chart" > + ROLE_SYSTEM_DIALOG "dialog" > + ROLE_SYSTEM_BORDER "border" > + ROLE_SYSTEM_GROUPING "grouping" > + ROLE_SYSTEM_SEPARATOR "separator" > + ROLE_SYSTEM_TOOLBAR "tool bar" > + ROLE_SYSTEM_STATUSBAR "status bar" > + ROLE_SYSTEM_TABLE "table" > + ROLE_SYSTEM_COLUMNHEADER "column header" > + ROLE_SYSTEM_ROWHEADER "row header" > + ROLE_SYSTEM_COLUMN "column" > + ROLE_SYSTEM_ROW "row" > + ROLE_SYSTEM_CELL "cell" > + ROLE_SYSTEM_LINK "link" > + ROLE_SYSTEM_HELPBALLOON "help balloon" > + ROLE_SYSTEM_CHARACTER "character" > + ROLE_SYSTEM_LIST "list" > + ROLE_SYSTEM_LISTITEM "list item" > + ROLE_SYSTEM_OUTLINE "outline" > + ROLE_SYSTEM_OUTLINEITEM "outline item" > + ROLE_SYSTEM_PAGETAB "page tab" > + ROLE_SYSTEM_PROPERTYPAGE "property page" > + ROLE_SYSTEM_INDICATOR "indicator" > + ROLE_SYSTEM_GRAPHIC "graphic" > + ROLE_SYSTEM_STATICTEXT "static text" > + ROLE_SYSTEM_TEXT "text" > + ROLE_SYSTEM_PUSHBUTTON "push button" > + ROLE_SYSTEM_CHECKBUTTON "check button" > + ROLE_SYSTEM_RADIOBUTTON "radio button" > + ROLE_SYSTEM_COMBOBOX "combo box" > + ROLE_SYSTEM_DROPLIST "drop down" > + ROLE_SYSTEM_PROGRESSBAR "progress bar" > + ROLE_SYSTEM_DIAL "dial" > + ROLE_SYSTEM_HOTKEYFIELD "hot key field" > + ROLE_SYSTEM_SLIDER "slider" > + ROLE_SYSTEM_SPINBUTTON "spin box" > + ROLE_SYSTEM_DIAGRAM "diagram" > + ROLE_SYSTEM_ANIMATION "animation" > + ROLE_SYSTEM_EQUATION "equation" > + ROLE_SYSTEM_BUTTONDROPDOWN "drop down button" > + ROLE_SYSTEM_BUTTONMENU "menu button" > + ROLE_SYSTEM_BUTTONDROPDOWNGRID "grid drop down button" > + ROLE_SYSTEM_WHITESPACE "white space" > + ROLE_SYSTEM_PAGETABLIST "page tab list" > + ROLE_SYSTEM_CLOCK "clock" > + ROLE_SYSTEM_SPLITBUTTON "split button" > + ROLE_SYSTEM_IPADDRESS "IP address" > + ROLE_SYSTEM_OUTLINEBUTTON "outline button" > +} > diff --git a/dlls/oleacc/tests/Makefile.in b/dlls/oleacc/tests/Makefile.in > new file mode 100644 > index 0000000..6e2bc8d > --- /dev/null > +++ b/dlls/oleacc/tests/Makefile.in > @@ -0,0 +1,13 @@ > +TOPSRCDIR = @top_srcdir@ > +TOPOBJDIR = ../../.. > +SRCDIR = @srcdir@ > +VPATH = @srcdir@ > +TESTDLL = oleacc.dll > +IMPORTS = kernel32 oleacc > + > +CTESTS = \ > + main.c > + > +(a)MAKE_TEST_RULES@ > + > +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend > diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c > new file mode 100644 > index 0000000..66b25af > --- /dev/null > +++ b/dlls/oleacc/tests/main.c > @@ -0,0 +1,121 @@ > +/* > + * oleacc tests > + * > + * Copyright 2008 Nikolay Sivov > + * > + * 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 <oleacc.h> > +#include "wine/test.h" > + > +static void test_getroletext(void) > +{ > + INT ret, role; > + CHAR buf[2], *buff, buff2[100]; > + WCHAR bufW[2], *buffW, buff2W[100]; > + > + /* wrong role number */ > + ret = GetRoleTextA(-1, NULL, 0); > + ok(ret == 0, "GetRoleTextA doesn't return zero on wrong role number, got %d\n", ret); > + buf[0] = '*'; > + ret = GetRoleTextA(-1, buf, 2); > + ok(ret == 0, "GetRoleTextA doesn't return zero on wrong role number, got %d\n", ret); > + ok(buf[0] == '*', "GetRoleTextA modified buffer on wrong role number\n"); > + buf[0] = '*'; > + ret = GetRoleTextA(-1, buf, 0); > + ok(ret == 0, "GetRoleTextA doesn't return zero on wrong role number, got %d\n", ret); > + ok(buf[0] == '*', "GetRoleTextA modified buffer on wrong role number\n"); > + > + ret = GetRoleTextW(-1, NULL, 0); > + ok(ret == 0, "GetRoleTextW doesn't return zero on wrong role number, got %d\n", ret); > + bufW[0] = '*'; > + ret = GetRoleTextW(-1, bufW, 2); > + ok(ret == 0, "GetRoleTextW doesn't return zero on wrong role number, got %d\n", ret); > + ok(bufW[0] == '\0', "GetRoleTextW doesn't return NULL char on wrong role number\n"); > + bufW[0] = '*'; > + ret = GetRoleTextW(-1, bufW, 0); > + ok(ret == 0, "GetRoleTextW doesn't return zero on wrong role number, got %d\n", ret); > + /* don't know why this char */ > + todo_wine ok(bufW[0] == 0x1e90, "GetRoleTextW returned wrong char, got %u\n", bufW[0]); > + > + /* zero role number - not documented */ > + ret = GetRoleTextA(0, NULL, 0); > + ok(ret > 0, "GetRoleTextA doesn't return (>0) for zero role number, got %d\n", ret); > + ret = GetRoleTextW(0, NULL, 0); > + ok(ret > 0, "GetRoleTextW doesn't return (>0) for zero role number, got %d\n", ret); > + > + /* NULL buffer, return length */ > + ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, NULL, 0); > + ok(ret > 0, "GetRoleTextA doesn't return length on NULL buffer, got %d\n", ret); > + ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, NULL, 1); > + ok(ret > 0, "GetRoleTextA doesn't return length on NULL buffer, got %d\n", ret); > + ret = GetRoleTextW(ROLE_SYSTEM_TITLEBAR, NULL, 0); > + ok(ret > 0, "GetRoleTextW doesn't return length on NULL buffer, got %d\n", ret); > + ret = GetRoleTextW(ROLE_SYSTEM_TITLEBAR, NULL, 1); > + ok(ret > 0, "GetRoleTextW doesn't return length on NULL buffer, got %d\n", ret); > + > + /* use a smaller buffer */ > + buf[0] = '*'; > + ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, buf, 1); > + ok(ret == 0, "GetRoleTextA returned wrong length\n"); > + ok(buf[0] == '\0', "GetRoleTextA returned not zero-length buffer\n"); > + buf[1] = '*'; > + ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, buf, 2); > + ok(ret == 1, "GetRoleTextA returned wrong length, got %d, expected 1\n", ret); > + ok(buf[1] == '\0', "GetRoleTextA returned not zero-length buffer\n"); > + > + bufW[0] = '*'; > + ret = GetRoleTextW(ROLE_SYSTEM_TITLEBAR, bufW, 1); > + ok(ret == 0, "GetRoleTextW returned wrong length, got %d, expected 1\n", ret); > + ok(bufW[0] == '\0', "GetRoleTextW returned not zero-length buffer\n"); > + bufW[1] = '*'; > + ret = GetRoleTextW(ROLE_SYSTEM_TITLEBAR, bufW, 2); > + ok(ret == 1, "GetRoleTextW returned wrong length, got %d, expected 1\n", ret); > + ok(bufW[1] == '\0', "GetRoleTextW returned not zero-length buffer\n"); > + > + /* use bigger buffer */ > + ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, NULL, 0); > + buff = HeapAlloc(GetProcessHeap(), 0, 2*ret); > + buff[2*ret-1] = '*'; > + ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, buff, 2*ret); > + ok(buff[2*ret-1] == '*', "GetRoleTextA shouldn't modify this part of buffer\n"); > + HeapFree(GetProcessHeap(), 0, buff); > + > + ret = GetRoleTextW(ROLE_SYSTEM_TITLEBAR, NULL, 0); > + buffW = HeapAlloc(GetProcessHeap(), 0, 2*ret*sizeof(WCHAR)); > + buffW[2*ret-1] = '*'; > + ret = GetRoleTextW(ROLE_SYSTEM_TITLEBAR, buffW, 2*ret); > + ok(buffW[2*ret-1] == '*', "GetRoleTextW shouldn't modify this part of buffer\n"); > + HeapFree(GetProcessHeap(), 0, buffW); > + > + /* check returned length for all roles */ > + for(role = 0; role <= ROLE_SYSTEM_OUTLINEBUTTON; role++){ > + ret = GetRoleTextA(role, NULL, 0); > + GetRoleTextA(role, buff2, sizeof(buff2)); > + ok(ret == lstrlenA(buff2), > + "GetRoleTextA: returned length doesn't match returned buffer for role %d\n", role); > + > + ret = GetRoleTextW(role, NULL, 0); > + GetRoleTextW(role, buff2W, sizeof(buff2W)/sizeof(WCHAR)); > + ok(ret == lstrlenW(buff2W), > + "GetRoleTextW: returned length doesn't match returned buffer for role %d\n", role); > + } > +} > + > +START_TEST(main) > +{ > + test_getroletext(); > +} Something wrong with this? Please let me know if it's so.

1 0

Re: mlang: tests, converstion test was falsely failing on windows xp for codepage 1361 (Korean, Johab) because of lack of roman characters
by Alexandre Julliard 09 Oct '08

09 Oct '08

Aric Stewart <aric(a)codeweavers.com> writes: > @@ -259,6 +259,15 @@ static BOOL check_convertible(IMultiLanguage2 *iML2, UINT from, UINT to) > > static WCHAR strW[] = {'a','b','c',0}; > > + if (from == 1361 || to == 1361) > + { > + /* > + * This is Korean (Johab). This codepages does not have latin > + * characters so these checks fail causing confusions later. > + */ > + return TRUE; > + } There should be a way to detect this with a generic check, instead of having to hardcode specific codepages. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Resend patch for 15494
by James Hawkins 09 Oct '08

09 Oct '08

2008/10/8 Chris Ahrendt <celticht32(a)aol.com>: > per dan resending > > > chris > > From e8ec03471e1206ea93fa6224d7c6b8b61422d80e Mon Sep 17 00:00:00 2001 > From: Chris Ahrendt <celticht32(a)aol.com> > Date: Tue, 7 Oct 2008 21:02:36 -0400 > Subject: [PATCH] Checked all the states of variables in test to ensure that > they are not NULL > This broad-sweep approach is not correct. If there is a machine that is crashing on a NULL interface, then a check needs to be added where that machine returns a NULL interface and we should then skip those particular tests. There are plenty of examples of this you can look for. -- James Hawkins

3 8

Re: gdi32: Add more font substitution tests, make them pass under Wine
by Jeremy White 09 Oct '08

09 Oct '08

Dmitry, This patch has triggered a bug in make test for me; I only notice it when I put a Windows flavor of arial.ttf into my windows/fonts directory. The specific failure is in get_glyph_indices when we're passing in a symbol charset (i.e. the 3rd loop). I've tracked it to line 3461 of gdi32/freetype.c. Specifically, the lfWeight is set to FW_DONTCARE but the charset is Symbol. Git-blame pointed at this patch. I find that if I modify tests/font.c to set a lfWeight of normal in get_glyph_indices, then the tests no longer fail. However, the test passes on Windows XP without needing that change, so I'm afraid that this code must be wrong. Here are the full commit details: commit a5d288f08c08dc19d217093fdf8622605c92a4e0 Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue May 13 22:10:05 2008 +0900 gdi32: Add more font substitution tests, make them pass under Wine. I was hoping that a resolution to this would be obvious to you, as you clearly understood this issue in depth when you wrote the patch. Cheers, Jeremy

2 1

Re: Jacek Caban : mshtml: Added IHTMLElement3 stub implementation.
by Michael Stefaniuc 08 Oct '08

08 Oct '08

Hello Jacek, Smatch complains about unreachable code introduced by this patch: Alexandre Julliard wrote: > Module: wine > Branch: master > Commit: 536fac7c1b4ef7f6f124d7f3100d3284313f3018 > URL: http://source.winehq.org/git/wine.git/?a=commit;h=536fac7c1b4ef7f6f124d7f31… > > Author: Jacek Caban <jacek(a)codeweavers.com> > Date: Tue Oct 7 14:44:18 2008 -0500 > > mshtml: Added IHTMLElement3 stub implementation. > > --- > > dlls/mshtml/Makefile.in | 1 + > dlls/mshtml/htmlelem.c | 4 + > dlls/mshtml/htmlelem3.c | 447 ++++++++++++++++++++++++++++++++++++++++++ > dlls/mshtml/mshtml_private.h | 3 + > dlls/mshtml/tests/dom.c | 14 ++ > 5 files changed, 469 insertions(+), 0 deletions(-) > > Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=536fac7c1b4ef7f6f124d… diff --git a/dlls/mshtml/htmlelem3.c b/dlls/mshtml/htmlelem3.c new file mode 100644 index 0000000..f85b065 --- /dev/null +++ b/dlls/mshtml/htmlelem3.c ... + +static HRESULT WINAPI HTMLElement3_put_disabled(IHTMLElement3 *iface, VARIANT_B +{ + HTMLElement *This = HTMLELEM3_THIS(iface); + FIXME("(%p)->(%x)\n", This, v); + return S_OK; + return E_NOTIMPL; +} + ... I would say to remove the S_OK return but I really don't know what is the best here. thanks bye michael

2 2

Re: [5/6] WineD3D: Remove some #ifdefs
by H. Verbeet 08 Oct '08

08 Oct '08

Right now it's simply broken of course. The extension being defined in the header is no guarantee the driver actually supports it.

3 3

Usability: WineCfg Part 1 -- Desktop Integration tab
by Reece Dunn 08 Oct '08

08 Oct '08

Hi, Reading up on the wineconf WWN issue, I noticed that it mentions usability and winecfg. Therefore, I decided to dig up my RFC relating to some ideas I had about winecfg that I sent to the list. I have attached a mockup of my ideas, which I have added to since my original mail. == APPEARANCE == NOTE: Ignore the groupbox being called "Theme", it should be "Appearance". 1. The "(No Theme)" text is replaced with "Wine Default". No theme does not make sense -- there is a theme, it is just the default one that Wine is using. 2. The "Install theme..." button is now "Load...". 3. There is a "Save..." button to save a users theme modifications. This makes it easier to create custom themes (especially colour-based themes). 4. There is a divider between the theme and appearance settings. This is to make it clearer that these are separate, but related. 5. The "Item" list field always has an item selected (currently does not select an item by default). This helps keyboard navigation. 6. The "Font" button has an elipsis at the end. This button brings up another dialog, so should have an elipsis. == FOLDERS == 1. The term "Shell folders" is replaced with "Folders". Using the word "shell" is too confusing for users, as they don't know what the shell is. 2. The "Map the Wine folders to the default locations" option allows the user to set all known folder types to be mapped to their Linux desktop equivalents. 3. The list has been replaced with a dropdown and restructured. This should provide a better user experience (no more link to) and accessability. 4. There is a "Reset to default" option that sets the current folder to its Linux desktop equivalent. 5. The "Browse" button now has an elipsis. This is because it launches a dialog. == OTHER == 1. We may want to provide a set of colour themes (e.g. Windows 95, Windows 2000, Ubuntu Human, ClearLooks, KDE Oxygen) to provide a better experience for the user by default - i.e. not just have the "No Theme" option initially. 2. We may want to be able to load a theme using the command line. This would allow - for example - distributions to setup Wine with a theme that matches their desktop, providing a more integrated experience to the user. 3. We may want to have a "Use the system's appearance" checkbox to enable Gnome/KDE/other integration, so that the colours and/or appearance is picked up from (and updated with) the native Linux environment. This would go above the theme drop-down. Comments welcome. - Reece

4 6

Re: mapi32: initialize session pointer to zero in MAPILogonEx (2nd resend)
by Louis. Lenders 08 Oct '08

08 Oct '08

diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index 936d435..5aace9a 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -109,6 +109,7 @@ HRESULT WINAPI MAPILogonEx(ULONG_PTR uiparam, LPWSTR profile, { FIXME("(0x%08lx %s %p 0x%08x %p) Stub\n", uiparam, debugstr_w(profile), password, flags, session); + *session=0; return SUCCESS_SUCCESS; } >Are you guaranteed that session is not NULL? No, no garantueed, but i looked up some code-samples by google, and as far as i can tell, the current stub for MAPILogonEx will pass back garbage anyway to the application, so my thought was this patch would be rather harmless anyway. >A test case would help. I guess you're right about that, thanks anyway for the comments. --Juan

3 2

Re: [PATCH 1/3] wininet: Validate parameters passed to RetrieveUrlCacheEntryInfoA/W.
by Paul Vriens 08 Oct '08

08 Oct '08

Rob Shearman wrote: > Add tests for this. > --- > dlls/wininet/tests/urlcache.c | 25 +++++++++++++++++++++++++ > dlls/wininet/urlcache.c | 14 ++++++++++++++ > 2 files changed, 39 insertions(+), 0 deletions(-) > > Hi Rob, Is the following test needed for an app? + ret = RetrieveUrlCacheEntryFile(TEST_URL, NULL, NULL, 0); This crashes on Win9x and NT4. Can we if(0) this test or should we work around the issue? -- Cheers, Paul.

2 2