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 March 13, 2011

March 13, 2011

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 March 13, 2011

March 13, 2011

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 March 13, 2011

March 13, 2011

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 March 13, 2011

March 13, 2011

> 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 March 13, 2011

March 13, 2011

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 March 13, 2011

March 13, 2011

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 March 13, 2011

March 13, 2011

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 March 12, 2011

March 12, 2011

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 March 12, 2011

March 12, 2011

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 March 12, 2011

March 12, 2011

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

Re: wineport: Add fast builtin & asm versions of ffs() + ctz() where supported.
by Alexandre Julliard March 11, 2011

March 11, 2011

Adam Martinson <amartinson(a)codeweavers.com> writes: > @@ -236,7 +241,40 @@ extern int getopt_long_only (int ___argc, char *const *___argv, > #endif /* HAVE_GETOPT_LONG */ > > #ifndef HAVE_FFS > -int ffs( int x ); > + #if defined(__i386__) || defined(__x86_64__) > + #define HAVE_FFS > + static inline int ffs( int x ) > + { > + if (!x) > + { > + return 0; > + } > + else > + { > + int ret; > + __asm__("bsfl %1, %0; incl %0" : "=r" (ret) : "r" (x)); > + return ret; > + } > + } > + #elif defined(__GNUC__) && GCC_VERSION >= 29503 > + #define HAVE_FFS > + #define ffs(x) __builtin_ffs(x) > + #else > + int ffs( int x ); > + #endif > +#endif You'd have to show benchmarks to prove that this complexity is necessary. Given that ffs() should already be inlined on all decent platforms, I doubt you'd be able to demonstrate a difference (if anything, your version would be slower because of the extra increment). -- Alexandre Julliard julliard(a)winehq.org

3 2

Re: wineport: Use a lookup table to make our slow ffs() a bit faster.
by Henri Verbeet March 11, 2011

March 11, 2011

Something like the following may be faster: static const int bit_pos[] = { 0x00, 0x01, 0x0e, 0x02, 0x0f, 0x1b, 0x12, 0x03, 0x1e, 0x10, 0x1c, 0x16, 0x18, 0x13, 0x0a, 0x04, 0x1f, 0x0d, 0x1a, 0x11, 0x1d, 0x15, 0x17, 0x09, 0x0c, 0x19, 0x14, 0x08, 0x0b, 0x07, 0x06, 0x05, }; const unsigned int c = 0x7dc4d65; return bit_pos[((x & -x) * c) >> 27]; I'd expect that mostly due to eliminating the branches and the implicit shift & mask operations in something like "y.c[1]".

3 2

Re: wined3d/context: Remove a trivial call to context_validate_onscreen_formats() in context_apply_blit_state().
by Henri Verbeet March 11, 2011

March 11, 2011

On 10 March 2011 20:22, Adam Martinson <amartinson(a)codeweavers.com> wrote: > - context_validate_onscreen_formats(device, context, NULL); > + /* It's silly to call context_validate_onscreen_formats() with a NULL depth_stencil. */ Sigh. I've asked you a very simple question about the performance impact of these changes *twice* now, and you ignored the question both times. Unless you have evidence that the compiler fails to eliminate the call by itself, and this actually makes any kind of difference, consistency is more important. The same goes for the IWineD3DDeviceImpl_MarkStateDirty() change, though at least in that case there's somewhat of a remote chance of it making a difference.

2 1

Re: include: Add rmxftmpl.h header.
by Alexandre Julliard March 11, 2011

March 11, 2011

Dylan Smith <dylan.ah.smith(a)gmail.com> writes: > Manually parsed a hexdump of D3DRM_XTEMPLATES from the native header; > comments to show the corresponding text encoding. I used a test > application to dump D3DRM_XTEMPLATES with this header and the native > header to confirm that this header binary compatible with the native one. That stuff needs to be generated from source, you can't just copy the native header contents. -- Alexandre Julliard julliard(a)winehq.org

2 1

re: wineport: Use a lookup table to make our slow ffs() a bit faster.
by Dan Kegel March 11, 2011

March 11, 2011

Do you actually have a system that doesn't have HAVE_FFS set? On my machine, int main(int argc, char **argv) { return ffs(argc); } compiles to pushl %ebp movl %esp, %ebp movl $-1, %edx bsfl 8(%ebp), %eax cmove %edx, %eax addl $1, %eax popl %ebp ret which is probably pretty fast. Large lookup tables can dirty the L1 cache and slow other things down. See also http://stackoverflow.com/questions/757059/position-of-least-significant-bit…

2 1

Re: [PATCH 1/6] user32: Add get/release routines for accessing cursor frames.
by Alexandre Julliard March 11, 2011

March 11, 2011

Erich Hoover <ehoover(a)mines.edu> writes: > @@ -135,6 +139,16 @@ static void release_icon_ptr( HICON handle, struct cursoricon_object *ptr ) > release_user_handle_ptr( ptr ); > } > > +struct static_cursoricon_object *get_icon_data( struct cursoricon_object *obj, int istep ) > +{ > + return &obj->frames[istep]; > +} > + > +void release_icon_data( struct cursoricon_object *obj, int istep, struct static_cursoricon_object *icon_data ) > +{ > + /* placeholder */ > +} I find your data structures confusing. You add a concept of icon_data separate from icon_ptr, but it doesn't correspond to the data structures, there's no such thing as an icon_data. There should be a way of making this clearer. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: programs/dxdiag: beginnings of support for /t option
by Henri Verbeet March 11, 2011

March 11, 2011

On 10 March 2011 20:35, Drew Goodwin <drew(a)drewgoodwin.com> wrote: > + length = MultiByteToWideChar(0, 0, name, -1, NULL, 0)+1; > + { > + /* Allocate on the stack */ > + WCHAR nameW[length]; Oh, and variable length arrays are a C99 feature, Wine tries to mostly stick to C89.

2 1

New winetricks 20110311b: winetricks is dead, long live winetricks
by Dan Kegel March 11, 2011

March 11, 2011

winetricks-20110311b is now released. Changes since winetricks-20110123 (for anyone who has not been using the alpha versions): - manages multiple wineprefixes - apps are now installed into separate wineprefixes by default - gui now split into separate pages for games, benchmarks, apps, dlls, fonts - gui now shows approximate disk requirement and install times - gui now lets you pick silent installation mode - apps that are broken (e.g. have drm that wine can't handle) are now hidden by default, gui has a button to reveal them - 70 games added, including Dragon Age II demo, Starcraft II demo, Mass Effect 2, and Mass Effect 2 demo - many updates and bugfixes Changes since winetricks-alpha-20110310: - mdac25, mdac27 removed, as downloads no longer available - mdac28: updated to sp1 - sizes/times in gui updated. (Most show download + install time; a future release will show just install time.) For bug tracker, mailing lists, and wiki, see http://winetricks.org Download url: http://winetricks.org/winetricks

1 0

re: links down
by Dan Kegel March 11, 2011

March 11, 2011

Looks like 2.8 sp1 is still up, though: http://www.microsoft.com/downloads/en/details.aspx?familyid=78cac895-efc2-4… I'll update winetricks, thanks. (And I'll put together a fast link checker for winetricks; doing a full run with an empty cache takes too long to be a good way of noticing broken links.) Wish I'd noticed this sooner!

1 0

Re: programs/dxdiag: beginnings of support for /t option
by Henri Verbeet March 11, 2011

March 11, 2011

On 10 March 2011 20:35, Drew Goodwin <drew(a)drewgoodwin.com> wrote: > I'm a CS student at UCLA. I and some classmates are adding features to > wine's dxdiag. Here's the first patch, with code by Steve Feng, Andrew > Freer, and myself, properly copyrighted and licensed under the LGPL. Once > this is accepted, we will send a series of patches to support the remaining > sections in the /t option and the /x option, and add a working gui. > Just some random comments, this is by no means a proper review: > -EXTRADEFS = -DWINE_NO_UNICODE_MACROS > +EXTRADEFS = -DWINE_NO_UNICODE_MACROS -D__WINE__ What do you need __WINE__ for? > +IMPORTS = advapi32 comdlg32 comctl32 d3d9 d3dx9 ddraw dsound dxguid gdi32 kernel32 ole32 oleaut32 shell32 user32 winmm > + That's a lot of imports, do you really need all of those in this patch? > +HINSTANCE g_hinstance; The way you're using this, that's just a slightly odd way to write "NULL". > + sysinfo = malloc(sizeof(DxDiag_SystemInfo)); You should typically use HeapAlloc() for memory allocation in Wine, except for rare cases where you pass the result to a library function that free()'s it. You also leak the sysinfo, but perhaps that's ok as long as you exit right after being done with it. The "g_dxdiagcom_root" global isn't very useful, just pass it to OutputPlainFile() directly.

1 0

Re: cryptnet/tests: Partially revert commit de6e33f306a3b1b424ad1a9c41e85d3692ef9e4d
by Joris Huizer March 11, 2011

March 11, 2011

Hello, I found a small (copy/paste) mistake in this patch: - /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH */ - ok(!ret && (GetLastError() == CRYPT_E_NO_MATCH), + /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH, older w2k: CRYPT_E_ASN1_BADTAG */ + ok(!ret && (GetLastError() == CRYPT_E_NO_MATCH || + broken(GetLastError() == CRYPT_E_NO_MATCH)), The comment indicates the alternative error, but the actual code doesn't check that one HTH, Joris

1 0

Re: wininet(4/7): Implement commiting a url cache entry that already existed (try 2)
by Alexandre Julliard March 11, 2011

March 11, 2011

Juan Lang <juan.lang(a)gmail.com> writes: > With the previous patches applied, this no longer fails for me on > Alexandre's apparently corrupt index.dat. Note that the index.dat I sent you was created from scratch, by running the wininet tests in an empty wineprefix. So if it's really corrupt it means wininet has corrupted it. It would probably be a good idea to fix this first. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: msxml3: Ignore XML Property ResolveExternals
by Nikolay Sivov March 11, 2011

March 11, 2011

On 3/11/2011 13:46, Alistair Leslie-Hughes wrote: > Hi, > > > Changelog: > msxml3: Ignore XML Property ResolveExternals Please correct naming: static const WCHAR PropertyNewParserW[] = {'N','e','w','P','a','r','s','e','r',0}; static const WCHAR PropValueXPathW[] = {'X','P','a','t','h',0}; static const WCHAR PropValueXSLPatternW[] = {'X','S','L','P','a','t','t','e','r','n',0}; +static const WCHAR PropValueResolveExternalsW[] = {'R','e','s','o','l','v','e','E','x','t','e','r','n','a','l','s',0}; It's not a value, it's a property with boolean value, so it's PropertyResolveExternalsW. > > > Best Regards > Alistair Leslie-Hughes

1 0

Re: wininet(7/7): Delete the cache file when it's no longer referenced (resend)
by Marvin March 11, 2011

March 11, 2011

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=9868 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: wininet(6/7): Delete cache entries when their use count reaches 0
by Marvin March 11, 2011

March 11, 2011

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=9867 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0