March 2011 - Wine-devel - list.winehq.org

riched20/tests: Beginnings of EM_SETMARGINS test. This patch is released into the Public Domain under the requirements of the LGPL version 2.1 or later. Released by James McKenzie jjmckenzie51@gmail.com
by James McKenzie 13 Mar '11

13 Mar '11

Just checking if gmail has a 'wrapping' problem or if this will actually go through. riched20/tests: Beginnings of EM_SETMARGINS test. This patch is released into the Public Domain under the requirements of the LGPL version 2.1 or later. Released by James McKenzie jjmckenzie51(a)gmail.com --- dlls/riched20/tests/editor.c | 215 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 215 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 7a4e032..31f3bdc 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7034,6 +7034,220 @@ static void test_dialogmode(void) DestroyWindow(hwParent); } +static INT CALLBACK is_truetype_font_installed_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +{ + if (type != TRUETYPE_FONTTYPE) return 1; + + return 0; +} + +static BOOL is_truetype_font_installed(const char *name) +{ + HDC hdc = GetDC(0); + BOOL ret = FALSE; + + if (!EnumFontFamiliesA(hdc, name, is_truetype_font_installed_proc, 0)) + ret = TRUE; + + ReleaseDC(0, hdc); + return ret; +} + +static INT CALLBACK is_font_installed_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +{ + return 0; +} + +static BOOL is_font_installed(const char *name) +{ + HDC hdc = GetDC(0); + BOOL ret = FALSE; + + if(!EnumFontFamiliesA(hdc, name, is_font_installed_proc, 0)) + ret = TRUE; + + ReleaseDC(0, hdc); + return ret; +} + +static void test_em_setmargins(void) +{ + HWND hwndRichEdit; + RECT old_rect, new_rect; + + HDC hDC; + LOGFONTA lfA; + UINT ret; + int ry, i, j, k; + + HFONT testFont1A, hDC_font; + + /* Add various window sizes for USEFONTINFO tests */ + static const struct rect_parameters + { + int start_left, start_top, end_right, end_bottom; + } rect_param[] = + { + { 0, 0, 400, 80 }, + }; + + /* data for ANSI font tests */ + static const struct font_margins_data + { + const char face_name[LF_FACESIZE]; + int weight, height, ascent, descent, int_leading, ext_leading; + int ave_char_width, max_char_width, dpi; + } fmd[] = + { + { "Courier", FW_NORMAL, 13, 11, 2, 0, 0, 8, 8, 96 }, + { "System", FW_BOLD, 16, 13, 3, 3, 0, 7, 14, 96 }, + { "Arial", FW_NORMAL, 16, 13, 3, 3, 0, 6, 35, 96, }, + }; + + /* Test data for margins testing */ + static const struct margin_test_data + { + int left_margin, right_margin; + DWORD margin_type; + } mmt [] = + { + { 0, 0, EC_LEFTMARGIN }, /*Clear all margin settings */ + /*Left Margin tests*/ + { 10, 0, EC_LEFTMARGIN }, /*Set Left Margin to 10 */ + { EC_USEFONTINFO, 0, EC_LEFTMARGIN }, /*Test EC_USEFONTINFO as lparam with EC_LEFTMARGIN */ + { 0, 0, EC_LEFTMARGIN }, /*Clear margins for Right Margin tests */ + /*EC_USEFONTINFO as lpararm tests */ + { 10, 10, EC_USEFONTINFO }, /*Set margins to 10 with EC_USEFONTINFO, should return zero */ + { 0, EC_USEFONTINFO, EC_USEFONTINFO }, /*Set Right Margin to EC_USEFONTINFO under EC_USEFONTINFO, should + return zero except with TrueType Fonts, this should be the lagging spacing value for large fonts and large + edit windows*/ + { EC_USEFONTINFO, 0, EC_USEFONTINFO }, /*Set Left Margin to EC_USEFONTINFO under EC_USEFONTINFO, should return + zero except with TrueType Fonts, this should be the leading spacing value for large fonts and large edit + windows*/ + { EC_USEFONTINFO, EC_USEFONTINFO, EC_USEFONTINFO }, /*Set both margins to EC_USEFONTINFO under EC_USEFONTINFO, + should have same results for both left and right tests above */ + { 0, 0, EC_USEFONTINFO }, /*Clear Margins, if set */ + }; + + /* Run tests for number of rectangles */ + for ( k=0; k< (sizeof(rect_param)/sizeof(rect_param[0])); k++) + { + hwndRichEdit = CreateWindow(RICHEDIT_CLASS, NULL, ES_MULTILINE|WS_POPUP|WS_HSCROLL|WS_VSCROLL|WS_VISIBLE, + rect_param[k].start_left, rect_param[k].start_top, rect_param[k].end_right, + rect_param[k].end_bottom, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwndRichEdit != NULL, "Error creating Richedit Window in EM_SETMARGINS test. error received: %d\n", + (int) GetLastError()); + if (!hwndRichEdit) + { + return; + } + + hDC = GetDC(hwndRichEdit); + ok (hDC != NULL, "Creation of hdc failed.\n"); + if (!hDC) + { + DestroyWindow(hwndRichEdit); + return; + } + + ry = GetDeviceCaps(hDC, LOGPIXELSY); + + ZeroMemory(&lfA, sizeof(lfA)); + ZeroMemory(&testFont1A, sizeof(HFONT)); + /*Initialize rect variable to be the size of the entire richedit window */ + old_rect.left = rect_param[k].start_left; + old_rect.right = rect_param[k].end_right; + old_rect.top = rect_param[k].start_top; + old_rect.bottom = rect_param[k].end_bottom; + SendMessageA(hwndRichEdit, EM_SETRECT, 0, (LPARAM)&old_rect); + SendMessageA(hwndRichEdit, EM_GETRECT, 0, (LPARAM)&old_rect); + ok (rect_param[k].start_left == old_rect.left , "Richedit control window not created correctly. Canceling " + "test for window size of %d by %d\n", rect_param[k].end_right, rect_param[k].end_bottom); + if (rect_param[k].start_left != old_rect.left) continue; + + /* Run tests for number of ANSI fonts */ + for (i = 0; i < sizeof(fmd)/sizeof(fmd[0]); i++) + { + strcpy(lfA.lfFaceName, fmd[i].face_name); + lfA.lfHeight = fmd[i].height; + lfA.lfCharSet = DEFAULT_CHARSET; + lfA.lfWeight = fmd[i].weight; + ret = is_font_installed(lfA.lfFaceName); + /* If font cannot cannot be found, skip rest of tests */ + ok (ret != 0, "Font not found, test results are not predictable. Aborting test for font %s\n", + fmd[i].face_name); + if (ret) continue; + ret = is_truetype_font_installed(lfA.lfFaceName); + if (lfA.lfFaceName == "Arial") + { + ok (ret == 0, "Truetype font emulated, test results will not be consistent with Windows!\n"); + if (!ret) continue; + } + + testFont1A = CreateFontIndirectA (&lfA); + hDC_font = SelectObject(hDC, testFont1A); + /* looping through the all of the tests */ + for (j=0; j < sizeof (mmt)/sizeof (mmt[1]); j++) + { + SendMessageA(hwndRichEdit, EM_SETMARGINS, mmt[j].margin_type, MAKELONG (mmt[j].left_margin, + mmt[j].right_margin)); + ret=SendMessageA(hwndRichEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + ok (ret == 0, "An error occurred getting new margins\n"); + switch (mmt[j].margin_type) + { + case EC_USEFONTINFO : + /* Per several web sources, using the EC_USEFONTINFO with a TrueType font should result in the + following: The Left Margin should be set to the 'C' value, that is the value used to set white + space after a character and the next printed character. This is also called leading spacing. + The Right Margin should be set to the 'A' value, that is the value use to set white space to the + current position before drawing the next character. This is also called lagging spacing. + During testing could not find a case where this was true for any version of riched20.dll */ + { + ok(new_rect.right == old_rect.right, "The right border moved in EC_USEFONTINFO Left/Right " + "margin change test to %d for font %s(%d)\n", old_rect.right - new_rect.right, + fmd[i].face_name, fmd[i].height); + ok(new_rect.left == old_rect.left, "The left border was moved in EC_USEFONTINFO Left/Right Margin " + "change test to %d for font %s(%d).\n", old_rect.left - new_rect.left, fmd[i].face_name, + fmd[i].height); + } + break; + case EC_LEFTMARGIN : + if (mmt[j].left_margin == 0 ) + { + ok(new_rect.left == old_rect.left, "The left border moved %d in the Left Margin " + "Zero test for font %s(%d).\n", new_rect.left - old_rect.left, fmd[i].face_name, fmd[i].height); + } + else + { + todo_wine { + ok(new_rect.left == old_rect.left + mmt[j].left_margin, "The left border moved %d and should be " + "%d in the Left margin change test for font %s(%d).\n", new_rect.left - old_rect.left, + mmt[j].left_margin, fmd[i].face_name, fmd[i].height); + } + } + ok(new_rect.right == old_rect.right, "The right border was moved %d in Left Margin change test for " + "font %s(%d).\n", new_rect.right - old_rect.right, fmd[i].face_name, fmd[i].height); + break; + case EC_LEFTMARGIN | EC_RIGHTMARGIN : + case EC_RIGHTMARGIN : + default: /* fall through if there is a data error or new margin type test */ + ok (0 == 1, "Check %s %d %d 0x%x\n", fmd[i].face_name, fmd[i].height, fmd[i].dpi, mmt[j].margin_type); + } + /* test if top or bottom margin moved. Test should not disturb them */ + ok(new_rect.top == old_rect.top, "The top border moved %d in the test.\n", + new_rect.top - old_rect.top); + ok(new_rect.bottom == old_rect.bottom, "The bottom border moved %d in the test\n", + new_rect.bottom - old_rect.bottom); + } + SelectObject(hDC, hDC_font); + DeleteObject(testFont1A); + } + DeleteObject(testFont1A); + ReleaseDC (hwndRichEdit, hDC); + DestroyWindow (hwndRichEdit); + } +} + START_TEST( editor ) { BOOL ret; @@ -7090,6 +7304,7 @@ START_TEST( editor ) test_WM_GETDLGCODE(); test_zoom(); test_dialogmode(); + test_em_setmargins(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging. -- 1.7.4

1 0

Wine announce on the website shows weird content
by Divaret Mathieu 13 Mar '11

13 Mar '11

Hello, I just wanted to tell you that the page on http://www.winehq.org/announce/ is bugged. It now shows git historic and curious non-sense links. Sorry to disturb if you already know. Continue the good job. Bye.

2 1

Re: programs/dxdiag: beginnings of support for /t option (try 2)
by Vitaliy Margolen 13 Mar '11

13 Mar '11

On 03/12/2011 09:55 PM, Drew Goodwin wrote: > Fixed issues pointed out by Andrew Nguyen and Henri Verbeet. > There are still number of things that needs fixing: > +static BOOL PrepareFilename(WCHAR* filename, const enum OUTFORMAT format); > +static void OutputPlainFile(FILE * hFile, DxDiag_Root g_dxdiagcom_root); > +static void OutputSectionHeading(int section, FILE * hFile); > +static void OutputNewline(FILE * hFile); > +static void OutputWString(FILE * hFile, WCHAR * buffer); > +static void OutputPlainPropertyTitle(int property, FILE * hFile); > +static void OutputPlainProperty(int property, WCHAR * value, FILE * hFile); Please rearrange your functions so you don't need forward declarations. > + WideCharToMultiByte(CP_UTF8, 0, filename, -1, utf8Filename, > + MAX_STRING_LEN, NULL, NULL); Why utf8? Native creates plain text file which isn't a utf8. Haven't checked on different languages, but I think it would use some windows codepage instead of utf8. > + LoadStringW(NULL, STRING_ERROR_OPENING_FILE, messageText, > + MAX_STRING_LEN); Please don't split file on 80-character boundary, all modern widescreen displays can comfortably display 100+ characters in huge font. > + else if (format == XML) > + WINE_FIXME("/x unimplemented\n"); If it's not implemented, please remove all related code and add it back with xml implementation. > + /* trailing periods are not allowed in windows filenames */ > + /* some characters not allowed in windows filenames */ You shouldn't need to perform these checks here. Kernel/ntdll already do all of that. > +static void OutputWString(FILE * hFile, WCHAR * buffer) > +{ > + utf8BufferSize = WideCharToMultiByte(CP_UTF8, 0, buffer, -1, NULL, 0, NULL, NULL); > + utf8Buffer = HeapAlloc(GetProcessHeap(), 0, utf8BufferSize); This has really big overhead. Please use stack buffer instead and only do allocation when the buffer it too small. > +++ b/programs/dxdiag/cmdline.h > +BOOL OutputToFile(WCHAR * filename, const enum OUTFORMAT format, DxDiag_Root g_dxdiagcom_root); You don't need 2 header files for 3 external functions. Just forward declare them in the file that uses them. Or better yet put it all into the same file. And last but not the least, you might want to fix dxdiagn.dll to return a bit more for system info then this: ------------------- System Information ------------------- Time of this report: Machine name: Operating System: Language: System Manufacturer: System Model: BIOS: Processor: Memory: Page File: Windows Dir: C:\windows DirectX Version: = "DirectX 9.0c (4.09.0000.0904) DX Setup Parameters: Vitaliy

1 0

Re: advapi32/tests: Add some skips
by Nikolay Sivov 13 Mar '11

13 Mar '11

> to quicker see on which platforms it doesn't work > --- > dlls/advapi32/security.c | 2 +- > dlls/advapi32/tests/registry.c | 11 ++++++++--- > 2 files changed, 9 insertions(+), 4 deletions(-) > > diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c > index 1aa7990..4ee5c7b 100644 > --- a/dlls/advapi32/security.c > +++ b/dlls/advapi32/security.c > @@ -2445,7 +2445,7 @@ AccessCheck( > BOOL ret = set_ntstatus( NtAccessCheck(SecurityDescriptor, ClientToken, DesiredAccess, > GenericMapping, PrivilegeSet, PrivilegeSetLength, > GrantedAccess,&access_status) ); > - if (ret) *AccessStatus = set_ntstatus( access_status ); > + if (ret) *AccessStatus = 1;//set_ntstatus( access_status ); > return ret; > } ?

2 1

re: GSOC CMD parser.
by Dan Kegel 13 Mar '11

13 Mar '11

Joel wrote: > ... > It does not seem like there are enough issues with the current > implementation to justify scrapping the current parser. The existing parser is pretty hard to understand and extend. We're probably a few man-months away from the point of diminishing returns, and I'm sure there are some bugs that can't be fixed without a rewrite. Have you read it enough to understand it yet? ( see also http://kegel.com/wine/sweng/2010/#parser ) > The way I would go about this task would be to fix all > the outstanding bugs, and add test cases for them ... Incremental improvements to the current parser would still be welcome and useful. For instance, supporting cmd /a ( see http://bugs.winehq.org/show_bug.cgi?id=21174 for someone's draft patch ). - Dan

1 0

Re: winex11: Quite a noisy FIXME
by Vitaliy Margolen 13 Mar '11

13 Mar '11

On 03/12/2011 12:10 PM, André Hentschel wrote: > Yeah i know the fixme has good reasons, but still it shouldn't mess on console. You shouldn't use broken Wine. Anything that indicates a broken Wine, especially due to missing dependencies during compile, should not be hidden. Vitaliy.

2 1

Help: afxctl.h missing
by Jaytirth S. Khairatkar 13 Mar '11

13 Mar '11

Hello, I am getting the following error when I am trying to compile in Winelib error: afxctl.h: No such file or directory How should I resolve this? thanks and regards Jaytirth Khairatkar -- Jaytirth S. Khairatkar System Architecture and Algorithms Mobile: 9223529523

2 1

Re: winex11: Quite a noisy FIXME
by Andrew Nguyen 12 Mar '11

12 Mar '11

On 03/12/2011 01:10 PM, André Hentschel wrote: > Yeah i know the fixme has good reasons, but still it shouldn't mess on console. > --- > dlls/winex11.drv/xrender.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c > index fde0b91..70fd5e2 100644 > --- a/dlls/winex11.drv/xrender.c > +++ b/dlls/winex11.drv/xrender.c > @@ -2435,7 +2435,9 @@ void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev) > BOOL XRender_AlphaBlend( X11DRV_PDEVICE *devDst, X11DRV_PDEVICE *devSrc, > struct bitblt_coords *dst, struct bitblt_coords *src, BLENDFUNCTION blendfn ) > { > - FIXME("not supported - XRENDER headers were missing at compile time\n"); > + static int once; > + if(!once) > + FIXME("not supported - XRENDER headers were missing at compile time\n"); > return FALSE; > } > Since the static variable once is never incremented, the if condition is practically a no-op.

1 0

Re: Make sure This->bsc.doc will be initialized while opening a zero byte html file, fix bug 25999 . modified: dlls/mshtml/navigate.c
by Jacek Caban 12 Mar '11

12 Mar '11

Hi Zuno, I don't think that's the right place for the fix. What's the exact problem you're trying to fix? AFAICS the only important difference your patch makes is that on_start_nsrequest will be always called in read_stream_data (possibly many times), but it's also called in on_stop_nsrequest if no data was read. Jacek

3 2

Re: inetcpl.cpl: Update French translation
by Nicolas Le Cam 12 Mar '11

12 Mar '11

Hi Frédéric, Le 12 mars 2011 09:09, Frédéric Delanoy <frederic.delanoy(a)gmail.com> a écrit : > --- > dlls/inetcpl.cpl/cpl_Fr.rc | 12 ++++++------ > 1 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/dlls/inetcpl.cpl/cpl_Fr.rc b/dlls/inetcpl.cpl/cpl_Fr.rc > index 54d19e9..1244ff6 100644 > --- a/dlls/inetcpl.cpl/cpl_Fr.rc > +++ b/dlls/inetcpl.cpl/cpl_Fr.rc > @@ -35,17 +35,17 @@ CAPTION "Général" > BEGIN > > GROUPBOX " Page d'accueil ", IDC_STATIC, 4, 4, 312, 52 > - LTEXT "Vous pouvez spécifier une adresse à utiliser comme page > d'accueil :", > + LTEXT "Vous pouvez spécifier l'adresse à utiliser comme page > d'accueil :", > IDC_STATIC, 68, 10, 242, 10 > EDITTEXT IDC_HOME_EDIT, 68, 22, 242, 12, WS_VISIBLE | ES_AUTOHSCROLL > PUSHBUTTON "Page &courante", IDC_HOME_CURRENT, 68, 36, 77, 14 > PUSHBUTTON "Page par &défaut", IDC_HOME_DEFAULT, 151, 36, 77, 14 > PUSHBUTTON "Page &blanche", IDC_HOME_BLANK, 233, 36, 77, 14 > - GROUPBOX " Browsing history ", IDC_STATIC, 4, 60, 312, 46 > - LTEXT "You can delete cached pages, cookies and other data.", > - IDC_STATIC, 58, 72, 252, 10 > - PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 86, 80, 14 > - PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 > + GROUPBOX " Historique de navigation ", IDC_STATIC, 4, 60, 312, 46 > + LTEXT "Vous pouvez effacer les pages en cache, les cookies et > d'autres données.", > + IDC_STATIC, 68, 72, 242, 10 > "Vous pouvez effacer les pages en cache, les cookies et autres données." should be better. > + PUSHBUTTON "&Effacer les fichiers...", IDC_HISTORY_DELETE, 151, 86, > 77, 14 > + PUSHBUTTON "&Paramètres...", IDC_HISTORY_SETTINGS, 233, 86, 77, 14 > > END > > -- > 1.7.4.1 > > -- Nicolas Le Cam

1 0