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

Re: [PATCH 6/6] user32: Add support for sequence-based animated cursors.
by Henri Verbeet March 11, 2011

March 11, 2011

On 10 March 2011 07:42, Erich Hoover <ehoover(a)mines.edu> wrote: > @@ -940,6 +954,7 @@ done: > #define ANI_seq__ID RIFF_FOURCC('s', 'e', 'q', ' ') > #define ANI_fram_ID RIFF_FOURCC('f', 'r', 'a', 'm') > #define ANI_rate_ID RIFF_FOURCC('r', 'a', 't', 'e') > +#define ANI_seq_ID RIFF_FOURCC('s', 'e', 'q', ' ') Just happened to notice this, but I doubt there's much point in having two different defines for sequence chunks.

2 1

Re: [4/4] d3d8: Test depth stencil size mismatches
by Henri Verbeet March 10, 2011

March 10, 2011

On 10 March 2011 22:58, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > @@ -264,6 +264,8 @@ struct IDirect3DSurface8Impl > > /* If set forward refcounting to this object */ > IUnknown *forwardReference; > + > + UINT width, height; > }; You could just ask wined3d for the surface size.

2 1

Re: [PATCH 3/4] mshtml: Added IHTMLPrivateWindow_GetAddressBarUrl implementation
by Marvin March 10, 2011

March 10, 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=9859 Your paranoid android. === WXPPROSP3 (32 bit htmldoc) === htmldoc.c:3564: Test failed: unexpected address bar url: L"about:blank" htmldoc.c:3526: Test failed: unexpected address bar url: L"about:blank" htmldoc.c:3557: Test failed: unexpected address bar url: L"about:blank" htmldoc.c:3564: Test failed: unexpected address bar url: L"about:replace" === WVISTAADM (32 bit htmldoc) === htmldoc.c:3564: Test failed: unexpected address bar url: L"about:blank" htmldoc.c:3526: Test failed: unexpected address bar url: L"about:blank" htmldoc.c:3557: Test failed: unexpected address bar url: L"about:blank" htmldoc.c:3564: Test failed: unexpected address bar url: L"about:replace" === W7PRO (32 bit htmldoc) === htmldoc.c:3564: Test failed: unexpected address bar url: L"about:blank" htmldoc.c:3526: Test failed: unexpected address bar url: L"about:blank" htmldoc.c:3557: Test failed: unexpected address bar url: L"about:blank" htmldoc.c:3564: Test failed: unexpected address bar url: L"about:replace" === W7PROX64 (32 bit htmldoc) === htmldoc.c:3564: Test failed: unexpected address bar url: L"about:blank" htmldoc.c:3526: Test failed: unexpected address bar url: L"about:blank" htmldoc.c:3557: Test failed: unexpected address bar url: L"about:blank" htmldoc.c:3564: Test failed: unexpected address bar url: L"about:replace" === W7PROX64 (64 bit htmldoc) === htmldoc.c:3564: Test failed: unexpected address bar url: L"about:blank" htmldoc.c:3526: Test failed: unexpected address bar url: L"about:blank" htmldoc.c:3557: Test failed: unexpected address bar url: L"about:blank" htmldoc.c:3564: Test failed: unexpected address bar url: L"about:replace"

1 0

Wine Gecko 1.2.0 RC1
by Jacek Caban March 10, 2011

March 10, 2011

Hi all, I'm happy to announce that the new update of Wine Gecko packages is almost there. It took long time since last beta to get to RC point from beta, not only because of many changes on our side, but mostly because of delays in Mozilla release process. We've done everything I've hoped to be done (and even more than I expected). I'm also happy that it was much better tested than previous times (mostly because they were available for so long). So far I'm aware of only one regression in Outlook that probably won't block the release because it seems to be a problem on Wine side (I can't be sure as I wasn't able to reproduce it so far). If I've missed something, please let me know. I'd appreciate help with testing. Builds are on Sourceforge [1]. To use it, just grab MSI files and put it into the directory where usually CAB files would go and apply the attached patch. Please let me know about any regression you notice. * CHANGES * - The CAB file is created without external dependencies Thanks to Alexandre for cabinet work. - We use MSI installers Thanks to Hans for winemsibuilder and preparing scripts that made it possible. - winedbg works with Gecko debug builds Thanks to Eric for many fixes to dbghelp/winedbg. Once he will merge his work to Wine, we will be able to use winedbg for comfortable Gecko debugging - win64 build now works - a few bug fixes - I've got rid of some Gecko ugly things like using API hooks * FURTHER PLANS * Firefox 4 RC1 came out yesterday and is expected to be the final build (so far nothing that would require another RC was found). Mozilla estimates release to be out in a week or two. I'm tempted to not wait and release early next week (so that it will live in Git for at least a few days before Wine release), but we will see how it will work. If we'd find any new blocker, it would most likely mean that we will release a week later. * FOR PACKAGERS * If you are interested in building the packager yourself from sources (so far I've heard about Debian and Fedora attempts to do so), everything is ready to support it now. Building instructions changed a bit after switching to use MSI files, but I've made things as easy as possible. Building the package itself is a matter of invoking one script with proper arguments. The tricky part is that Wine is needed for building, so we get circural build-time dependency. The script, however, makes sure that Wine doesn't need Gecko during compiling Gecko, so it shouldn't be a big problem to handle. Also, unless you manually set WINEPREFIX, the script created a temporary wineprefix directory, so there is nothing to worry if your ~/.wine is in broken state. It can also use Wine from its build dir if you set WINE_BUILD_DIR environment variable. Please let me know if there are more problems than need to be addressed and feel free to contact me if you have any questions. Thanks, Jacek [1] http://sourceforge.net/projects/wine/files/Wine%20Gecko/1.2.0-rc1/

3 4

Re: wininet(6/10): Implement commiting a url cache entry that already existed
by Alexandre Julliard March 10, 2011

March 10, 2011

Juan Lang <juan.lang(a)gmail.com> writes: > As a nice side effect, the aggravating fixme about not knowing what to > do disappears. The tests just hang for me: ../../../tools/runtest -q -P wine -M wininet.dll -T ../../.. -p wininet_test.exe.so http.c && touch http.ok fixme:wininet:set_cookie persistent cookies not handled (L"expires=Sat, 09 Apr 2011 14:14:39 GMT; path=/") fixme:wininet:InternetSetOptionW Option 43 STUB fixme:wininet:InternetSetOptionW Option 44 STUB fixme:wininet:CommitUrlCacheEntryInternal Trying to delete entry of unknown format "\x00\x00\x00\x00" -- Alexandre Julliard julliard(a)winehq.org

2 1

Links down
by Diego Diaz March 10, 2011

March 10, 2011

sh winetricks mdac25 Executing wget -O mdac_typ.exe -nd -c --read-timeout=300 --retry-connrefused --header Accept-Encoding: gzip,deflate http://download.microsoft.com/download/e/e/4/ee4fe9ee-6fa1-4ab6-ab8c-fe1769… --2011-03-10 16:16:31-- http://download.microsoft.com/download/e/e/4/ee4fe9ee-6fa1-4ab6-ab8c-fe1769… Resolving download.microsoft.com... 77.67.20.40, 77.67.20.51, 77.67.20.64 Connecting to download.microsoft.com|77.67.20.40|:80... connected. HTTP request sent, awaiting response... 404 Not Found 2011-03-10 16:16:32 ERROR 404: Not Found. ------------------------------------------------------ Note: command 'wget -O mdac_typ.exe -nd -c --read-timeout=300 --retry-connrefused --header Accept-Encoding: gzip,deflate http://download.microsoft.com/download/e/e/4/ee4fe9ee-6fa1-4ab6-ab8c-fe1769…' returned status 8. Aborting. ------------------------------------------------------ ------------------------------------------------------ mdac25 failed ************************************************************************************************************************************************* sh winetricks mdac28 Executing wget -O MDAC_TYP.EXE -nd -c --read-timeout=300 --retry-connrefused --header Accept-Encoding: gzip,deflate http://download.microsoft.com/download/c/d/f/cdfd58f1-3973-4c51-8851-49ae37… --2011-03-10 16:16:09-- http://download.microsoft.com/download/c/d/f/cdfd58f1-3973-4c51-8851-49ae37… Resolving download.microsoft.com... 77.67.20.40, 77.67.20.24 Connecting to download.microsoft.com|77.67.20.40|:80... connected. HTTP request sent, awaiting response... 404 Not Found 2011-03-10 16:16:10 ERROR 404: Not Found. ------------------------------------------------------ Note: command 'wget -O MDAC_TYP.EXE -nd -c --read-timeout=300 --retry-connrefused --header Accept-Encoding: gzip,deflate http://download.microsoft.com/download/c/d/f/cdfd58f1-3973-4c51-8851-49ae37…' returned status 8. Aborting. ------------------------------------------------------ ------------------------------------------------------ mdac28 failed

1 0

New winetricks 20110310-alpha: new verbs csi6_demo, farmsim2011_demo, mono210
by Dan Kegel March 10, 2011

March 10, 2011

Version 20110310-alpha adds two games csi6_demo - CSI: Fatal Conspiracy Demo farmsim2011_demo - Farming Simulator 2011 Demo plus a new version of mono (2.10). There are a couple gui changes: it adds a help button and a button to unhide broken titles,and adds a scary warning to the dinput and directx9 verb menu items. It also fixes a number of bugs. For bug tracker, mailing lists, and wiki, see http://winetricks.org Download url: http://winetricks.org/winetricks-alpha There's also an announcements mailing list for package maintainers now: http://groups.google.com/group/winetricks-announce Changes since 20110306-alpha: vbrun5, vbrun6: fix install check. vc2005trial: fix regression caused by 7zip installing into its own wineprefix. richtx32: fix install check Print unix file rather than windows file when install check fails, it's much less mysterious. farmsim2011_demo: fix media type Avoid syntax error if which returns empty string list-installed: no longer need kludge. Also sort the inputs rather than the outputs so output shows up faster. firefox4: update to rc1 mono210: new verb w_download: fix penpenxmas and autohotkey right this time w_download: don't set user-agent, it breaks sourceforge download csi6_demo: new verb farmsim2011_demo: new verb. sammax301_demo: fix typo (it's not 304) Add gui option for showing broken apps. Not great, but it'll do for now. Main menu is called 'main', so call prefix menu 'prefix'... masseffect2_demo: use wine-hotfix-6971 if present. Also fix -q support. tahoma: fix install check grr. really fix navigation, I hope. help: new verb, just opens winetricks.org/help in a browser. This is the very first entry on the first menu of the gui. fix breakage in zenity menus remove dead code dxdiag: list under 'dlls' rather than 'apps', since it's usually used in the context of some other app. Make directx9 warning more obvious. OS reporting didn't work well, so put wine version in that slot Fix navigation when returning back from apps Fix KDE support in top menu. Fix time/space columns in German and (kind of) Danish. d3dcompiler_43: new verb by Rico; marked as broken to hide it from casual users until wine can handle more d3d10 dinput: add scary warning

1 0

Re: [1/2] wininet: Partially implement FreeUrlCacheSpaceW. (try 2)
by Alexandre Julliard March 10, 2011

March 10, 2011

Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> writes: > @@ -1660,6 +1660,16 @@ BOOLAPI DeleteUrlCacheEntryA(LPCSTR); > BOOLAPI DeleteUrlCacheEntryW(LPCWSTR); > #define DeleteUrlCacheEntry WINELIB_NAME_AW(DeleteUrlCacheEntry) > > +/* FCS_ flags and FreeUrlCacheSpace are no longer documented */ > +#define FCS_PERCENT_CACHE_SPACE 0 /* guessed value */ > +#define FCS_PERCENT_DISK_SPACE 1 /* guessed value */ > +#define FCS_ABSOLUTE_SIZE 2 /* guessed value */ Where do these come from then? If you made them up they shouldn't go in a public header. -- Alexandre Julliard julliard(a)winehq.org

2 2

d3dxcreatebox patch
by David Adam March 10, 2011

March 10, 2011

Hello, is there any problem with my d3dxcreatebox patch? Thanks in advance for any feedback. A+ David

3 5

Re: winecfg: Protect from closing the root key.
by Alexandre Julliard March 10, 2011

March 10, 2011

Dmitry Timoshkov <dmitry(a)codeweavers.com> writes: > This patch should fix the crash reported in the bug #26367. A better way would be to use RegOpenKeyExW. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 5/6] user32: Add support for retrieving individual animated frames.
by Alexandre Julliard March 10, 2011

March 10, 2011

Erich Hoover <ehoover(a)mines.edu> writes: > @@ -101,19 +93,40 @@ struct cursoricon_object > UINT width; > UINT height; > POINT hotspot; > + UINT delay; /* delay between this frame and the next (in jiffies) */ > + BOOL is_ani; /* whether this object is a static cursor or an animated cursor */ > UINT num_frames; /* number of frames in the icon/cursor */ > UINT num_steps; /* number of sequence steps in the icon/cursor */ > - UINT delay; /* global delay between frames (in jiffies) */ > - struct cursoricon_frame frames[1]; /* icon frame information */ > }; Some of these fields don't make sense for a static cursor. Also please try to do this change in smaller steps. -- Alexandre Julliard julliard(a)winehq.org

1 0

hooking into wine (GL video capturing app)
by Christian Parpart March 10, 2011

March 10, 2011

Hey all, a few years ago I once developed an application for recording the video of the 3D games I played via wine (and cedega). This all worked quite fine these days and I remember that cedega's wine engine used other libX11 functions to process events than wine itself did or still does. In my software, I am overriding the specific library functions I want to hook in, such as glXSwapBuffers, XNextEvent, XCheckIfEvent, ... and then do LD_PRELOAD_LIBRARY this when starting wine. Note, only wine used to use XCheckIfEvent but cedega used some other function to process events, IIRC. This all worked fine back in the days I developed it, now I want to resurrect this project and found myself in troubles. That is, I can successfully hook into OpenGL library functions, but I just cannot find a trace on why my XCheckIfEvent is not being used by wine. A few days back one guy at IRC told me that I have to look at the wine's x11drv source code, which I did, but all I can see, is, that wine indeed still seems to use XCheckIfEvent(). Checking my running wine app (with my library preloaded) using lsof I can see that my library is indeed successfully hooked up into the process image at least, and so do my hooks to the OpenGL functions work. As a test, I also hooked up into XOpenDisplay from libX11, it worked, but still, XCheckIfEvent() does not, and my only clue is, that this piece of code of wine isn't actually the one processing the events. As a side note, I need to hook up into libX11 to capture keyboard input to actually start/stop video recording / screenshotting on keyboard events. Can anyone please help me out here why I cannot grap wine's keyboard events? In case of interest, the following is the link to the source code in question: http://redmine.xzero.ws/projects/captury/repository/revisions/master/entry/… Best regards, Christian Parpart.

2 1

Re: USB Osciloscope
by Archie Robertson March 10, 2011

March 10, 2011

> Hello, > > What WINE version do you try to use? > What do you put to the WINE registry? > Could you send me ezusb.sys and a starting WINE log with > WINEDEBUG=+winedevice,+ntoskrnl,+usbhub ? > > Thanks, > Alexander Here is the information you have requested. I had trouble emailing the driver, so I put them on my web server at www.robertsonrobots.com/ezusb.sys Thanks for the help, Archie wine-1.0.1 REGEDIT4 [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Enum\USB] [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Enum\USB\Vid_3195&Pid_0004] [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Enum\USB\Vid_3195&Pid_0004\5&c1e6cce&0&1] "Capabilities"=dword:00000084 "Class"="DSO" "ClassGUID"="{4C696E6B-2049-6E73-7472-756D656E7473}" "CompatibleIDs"=hex(7):55,53,42,5c,43,6c,61,73,73,5f,66,65,26,53,75,62,43,6c,61,\ 73,73,5f,30,33,26,50,72,6f,74,5f,30,30,00,55,53,42,5c,43,6c,61,73,73,5f,66,\ 65,26,53,75,62,43,6c,61,73,73,5f,30,33,00,55,53,42,5c,43,6c,61,73,73,5f,66,\ 65,00,00 "ConfigFlags"=dword:00000000 "DeviceDesc"="Link Instruments DSO-8502" "Driver"="{4C696E6B-2049-6E73-7472-756D656E7473}\\0001" "HardwareID"=hex(7):55,53,42,5c,56,69,64,5f,33,31,39,35,26,50,69,64,5f,30,30,30,\ 34,26,52,65,76,5f,30,30,30,35,00,55,53,42,5c,56,69,64,5f,33,31,39,35,26,50,\ 69,64,5f,30,30,30,34,00,00 "LocationInformation"="DSO-8502" "Mfg"="Link Instruments" "Service"="ezusb" "UINumber"=dword:00000000 [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Enum\USB\Vid_3195&Pid_0004\5&c1e6cce&0&1\Device Parameters] "SymbolicName"="\\??\\USB#Vid_3195&Pid_0004#5&c1e6cce&0&1#{a5dcbf10-6530-11d2-901f-00c04fb951ed}" [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Enum\USB\Vid_3195&Pid_0004\5&c1e6cce&0&1\LogConf] [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Enum\USB\Vid_3195&Pid_0004\5&c1e6cce&0&2] "Capabilities"=dword:00000084 "Class"="DSO" "ClassGUID"="{4C696E6B-2049-6E73-7472-756D656E7473}" "CompatibleIDs"=hex(7):55,53,42,5c,43,6c,61,73,73,5f,66,65,26,53,75,62,43,6c,61,\ 73,73,5f,30,33,26,50,72,6f,74,5f,30,30,00,55,53,42,5c,43,6c,61,73,73,5f,66,\ 65,26,53,75,62,43,6c,61,73,73,5f,30,33,00,55,53,42,5c,43,6c,61,73,73,5f,66,\ 65,00,00 "ConfigFlags"=dword:00000000 "DeviceDesc"="Link Instruments DSO-8502" "Driver"="{4C696E6B-2049-6E73-7472-756D656E7473}\\0000" "HardwareID"=hex(7):55,53,42,5c,56,69,64,5f,33,31,39,35,26,50,69,64,5f,30,30,30,\ 34,26,52,65,76,5f,30,30,30,35,00,55,53,42,5c,56,69,64,5f,33,31,39,35,26,50,\ 69,64,5f,30,30,30,34,00,00 "LocationInformation"="DSO-8502" "Mfg"="Link Instruments" "Service"="ezusb" "UINumber"=dword:00000000 [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Enum\USB\Vid_3195&Pid_0004\5&c1e6cce&0&2\Device Parameters] "SymbolicName"="\\??\\USB#Vid_3195&Pid_0004#5&c1e6cce&0&2#{a5dcbf10-6530-11d2-901f-00c04fb951ed}" [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Enum\USB\Vid_3195&Pid_0004\5&c1e6cce&0&2\LogConf] REGEDIT4 [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\ezusb] "ErrorControl"=dword:00000001 "ImagePath"="\"system32\\\\driver\\\\ezusb.sys\"" "Start"=dword:00000003 "Type"=dword:00000001 [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\ezusb\Security] "Security"=hex:01,00,14,80,a0,00,00,00,ac,00,00,00,14,00,00,00,30,00,00,00,02,\ 00,1c,00,01,00,00,00,02,80,14,00,ff,01,0f,00,01,01,00,00,00,00,00,01,00,00,\ 00,00,02,00,70,00,04,00,00,00,00,00,18,00,fd,01,02,00,01,01,00,00,00,00,00,\ 05,12,00,00,00,00,00,00,00,00,00,1c,00,ff,01,0f,00,01,02,00,00,00,00,00,05,\ 20,00,00,00,20,02,00,00,00,00,00,00,00,00,18,00,8d,01,02,00,01,01,00,00,00,\ 00,00,05,0b,00,00,00,20,02,00,00,00,00,1c,00,fd,01,02,00,01,02,00,00,00,00,\ 00,05,20,00,00,00,23,02,00,00,00,00,00,00,01,01,00,00,00,00,00,05,12,00,00,\ 00,01,01,00,00,00,00,00,05,12,00,00,00 phoenox(a)firebird:~/.wine/drive_c/DSO8000$ WINEDEBUG=+winedevice, +ntoskrnl,+usbhub wine ezusb.sys trace:winedevice:ServiceMain starting service L"MountMgr" trace:winedevice:load_driver loading driver L"C:\\windows\\system32\ \drivers\\mountmgr.sys" trace:ntoskrnl:IoCreateDevice (0x7ee8c480, 0, L"\\Device\ \MountPointManager", 0, 0, 0, 0x7ec048ac) trace:ntoskrnl:IoCreateSymbolicLink L"\\??\\MountPointManager" -> L"\ \Device\\MountPointManager" trace:ntoskrnl:IoCreateDevice (0x1117b0, 20, L"\\Device\\Harddisk0", 0, 0, 0, 0x7ec047f8) trace:ntoskrnl:IoCreateSymbolicLink L"\\??\\PhysicalDrive0" -> L"\ \Device\\Harddisk0" trace:ntoskrnl:IoCreateDevice (0x1117b0, 20, L"\\Device\ \HarddiskVolume1", 0, 0, 0, 0x7ec3a540) trace:ntoskrnl:IoCreateSymbolicLink L"\\DosDevices\\C:" -> L"\\Device\ \HarddiskVolume1" trace:ntoskrnl:IoCreateSymbolicLink L"\\??\ \Volume{00000000-0000-0000-0000-000000000043}" -> L"\\Device\ \HarddiskVolume1" trace:ntoskrnl:IoCreateDevice (0x1117b0, 20, L"\\Device\ \HarddiskVolume1", 0, 0, 0, 0x7ec3a568) trace:ntoskrnl:IoCreateDevice (0x1117b0, 20, L"\\Device\ \HarddiskVolume2", 0, 0, 0, 0x7ec3a568) trace:ntoskrnl:IoCreateSymbolicLink L"\\DosDevices\\D:" -> L"\\Device\ \HarddiskVolume2" trace:ntoskrnl:IoCreateSymbolicLink L"\\??\ \Volume{00000000-0000-0000-0000-000000000044}" -> L"\\Device\ \HarddiskVolume2" trace:ntoskrnl:IoCreateDevice (0x1117b0, 20, L"\\Device\ \HarddiskVolume1", 0, 0, 0, 0x7ec3a590) trace:ntoskrnl:IoCreateDevice (0x1117b0, 20, L"\\Device\ \HarddiskVolume2", 0, 0, 0, 0x7ec3a590) trace:ntoskrnl:IoCreateDevice (0x1117b0, 20, L"\\Device\ \HarddiskVolume3", 0, 0, 0, 0x7ec3a590) trace:ntoskrnl:IoCreateSymbolicLink L"\\DosDevices\\H:" -> L"\\Device\ \HarddiskVolume3" trace:ntoskrnl:IoCreateSymbolicLink L"\\??\ \Volume{00000000-0000-0000-0000-000000000048}" -> L"\\Device\ \HarddiskVolume3" trace:ntoskrnl:IoCreateDevice (0x1117b0, 20, L"\\Device\ \HarddiskVolume1", 0, 0, 0, 0x7ec3a5b8) trace:ntoskrnl:IoCreateDevice (0x1117b0, 20, L"\\Device\ \HarddiskVolume2", 0, 0, 0, 0x7ec3a5b8) trace:ntoskrnl:IoCreateDevice (0x1117b0, 20, L"\\Device\ \HarddiskVolume3", 0, 0, 0, 0x7ec3a5b8) trace:ntoskrnl:IoCreateDevice (0x1117b0, 20, L"\\Device\ \HarddiskVolume4", 0, 0, 0, 0x7ec3a5b8) trace:ntoskrnl:IoCreateSymbolicLink L"\\DosDevices\\Z:" -> L"\\Device\ \HarddiskVolume4" trace:ntoskrnl:IoCreateSymbolicLink L"\\??\ \Volume{00000000-0000-0000-0000-00000000005a}" -> L"\\Device\ \HarddiskVolume4" trace:winedevice:init_driver init done for L"MountMgr" obj 0x7ee8c480 trace:winedevice:init_driver - DriverInit = 0x7ec383c0 trace:winedevice:init_driver - DriverStartIo = (nil) trace:winedevice:init_driver - DriverUnload = (nil) trace:winedevice:init_driver - MajorFunction[0] = (nil) trace:winedevice:init_driver - MajorFunction[1] = (nil) trace:winedevice:init_driver - MajorFunction[2] = (nil) trace:winedevice:init_driver - MajorFunction[3] = (nil) trace:winedevice:init_driver - MajorFunction[4] = (nil) trace:winedevice:init_driver - MajorFunction[5] = (nil) trace:winedevice:init_driver - MajorFunction[6] = (nil) trace:winedevice:init_driver - MajorFunction[7] = (nil) trace:winedevice:init_driver - MajorFunction[8] = (nil) trace:winedevice:init_driver - MajorFunction[9] = (nil) trace:winedevice:init_driver - MajorFunction[10] = (nil) trace:winedevice:init_driver - MajorFunction[11] = (nil) trace:winedevice:init_driver - MajorFunction[12] = (nil) trace:winedevice:init_driver - MajorFunction[13] = (nil) trace:winedevice:init_driver - MajorFunction[14] = 0x7ec37630 trace:winedevice:init_driver - MajorFunction[15] = (nil) trace:winedevice:init_driver - MajorFunction[16] = (nil) trace:winedevice:init_driver - MajorFunction[17] = (nil) trace:winedevice:init_driver - MajorFunction[18] = (nil) trace:winedevice:init_driver - MajorFunction[19] = (nil) trace:winedevice:init_driver - MajorFunction[20] = (nil) trace:winedevice:init_driver - MajorFunction[21] = (nil) trace:winedevice:init_driver - MajorFunction[22] = (nil) trace:winedevice:init_driver - MajorFunction[23] = (nil) trace:winedevice:init_driver - MajorFunction[24] = (nil) trace:winedevice:init_driver - MajorFunction[25] = (nil) trace:winedevice:init_driver - MajorFunction[26] = (nil) trace:winedevice:init_driver - MajorFunction[27] = (nil) err:module:attach_process_dlls "USBD.SYS" failed to initialize, aborting err:module:LdrInitializeThunk Main exe initialization for L"C:\\DSO8000\ \ezusb.sys" failed, status c0000142

2 1

Re: [PATCH 3/3] msi: Add an offset to sequence numbers belonging to files added by a patch.
by Hans Leidekker March 10, 2011

March 10, 2011

On Thu, 2011-03-10 at 02:20 +0100, David Hedberg wrote: > +static UINT msi_set_patch_offsets(MSIPACKAGE *package) > +{ > + static const WCHAR query_media[] = { > + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','M','e','d','i','a',' ', > + 'W','H','E','R','E',' ','S','o','u','r','c','e',' ','I','S',' ','N','O','T',' ','N','U','L','L',0}; You should order the list by DiskId to protect against installers with multiple sources for a given file sequence number. We do this elsewhere, and although I'm not sure it matches native it will at least give consistent behavior. Also, MSDN tells me the Source column is ignored if the Cabinet column is empty. > UINT msi_apply_patch_db( MSIPACKAGE *package, MSIDATABASE *patch_db, MSIPATCHINFO *patch ) > { > UINT i, r = ERROR_SUCCESS; > @@ -640,6 +796,7 @@ UINT msi_apply_patch_db( MSIPACKAGE *package, MSIDATABASE *patch_db, MSIPATCHINF > return r; > > msi_set_media_source_prop( package ); > + msi_set_patch_offsets( package ); There can be more than one transform in the patch that modifies the Media table. It's unlikely, but it may mean that offsets need to be applied after each transform that modifies the Media table instead of after each patch.

1 0

Re: wininet: Reimplement IsUrlCacheEntryExpired
by Marvin March 9, 2011

March 9, 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=9825 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [2/5] d3dx9: Support triangulation of complex glyphs in D3DXCreateText.
by Alexandre Julliard March 9, 2011

March 9, 2011

Dylan Smith <dylan.ah.smith(a)gmail.com> writes: > +static void sort_vertex_indices(struct point2d_index *start, int count) > +{ > + struct point2d_index *current, *middle_value, *last; > + int below_count; > + > + if (count <= 1) > + return; > + > + /* quick sort */ > + last = start + count - 1; > + middle_value = last--; > + current = start; > + while (current <= last) > + { > + if (compare_vertex_indices(current, middle_value) < 0) { > + current++; > + } else { > + swap_vertex_indices(current, last); > + last--; > + } > + } > + swap_vertex_indices(current, middle_value); > + > + below_count = current - start; > + sort_vertex_indices(start, below_count); > + sort_vertex_indices(current + 1, count - below_count - 1); > +} Is there a reason for not using qsort? -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 4/4] d3d9: Surfaces always have resource type WINED3DRTYPE_SURFACE.
by Stefan Dösinger March 8, 2011

March 8, 2011

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Actually I think we have a test that shows that if the surface is part of a texture it has resource type WINED3DRTYPE_TEXTURE. (Unverified, it's too late so I am too lazy to look for the exact test atm) Am 08.03.2011 um 19:41 schrieb Henri Verbeet: > --- > dlls/d3d9/device.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c > index 1dd6895..e008b31 100644 > --- a/dlls/d3d9/device.c > +++ b/dlls/d3d9/device.c > @@ -1081,8 +1081,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(IDirect3DDevice9Ex *iface, > > /* This method is only allowed with surfaces that are render targets, or > * offscreen plain surfaces in D3DPOOL_DEFAULT. */ > - if (!(desc.usage & WINED3DUSAGE_RENDERTARGET) > - && (desc.pool != WINED3DPOOL_DEFAULT || desc.resource_type != WINED3DRTYPE_SURFACE)) > + if (!(desc.usage & WINED3DUSAGE_RENDERTARGET) && desc.pool != WINED3DPOOL_DEFAULT) > { > wined3d_mutex_unlock(); > WARN("Surface is not a render target, or not a stand-alone D3DPOOL_DEFAULT surface\n"); > -- > 1.7.3.4 > > > -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.17 (Darwin) iQIcBAEBAgAGBQJNdrJeAAoJEN0/YqbEcdMwx3kP/0FGwYvZM7+YUz1atAfcpTQH mFsaWRKCMac9FHWHsoK++HyeN0R0F69NMnJzH33u2xxhrM6DvPfHsDrP0kcySHDN 3sVP/87U1cdHaVmURjnx6o0+3elj/IikmM0rGkTT3eityItp5hgj+OiizuD+wwQ5 jxrcsvI1tS4iZe+j+2s8zt1zJYhGNhJRI5n8IFCpPP3MXFqDPxxiUwua7MRweWx3 MRZQVkmJ4/3Jy5rTKjf4LROBqY2ZLP8Yeyo0jgAS3Wn+1LEJqKtgEhz03/rxGNPQ Lwpx+1gLsl2XonbZMPUXfhoE4ETi70S7OC2Z3EVOBY+XbEPRdEq6qIsoAQwFfHFQ AVo8qjSndjcd9sxQ4MQyarxHfRuL9OlCnO+WKfMOHo1WFdBg7I8uPrYKuZmlDZ2c lEwSOgh2Td0PCs0Gha0uqt8Gav5t1M40zKoGE2Lmd8gKAu4+Ot1IwbhU0tebaKMC JUD0d83oNgxbPsoKUdbbnq4oeDBMNnnFKQ18m9H7N1LABe9hzE13IfcxCfVLWfzk CtJlYWBeqa5hD5Chf1eNMuZEHyooaRhgy6Q0Vd5DVVpTMj9JzURIo7Mnb43GG9QT H7EkmVR2Ivn8ZHzF7nqeAJxqcWQKPmpn5/RTqapPbVx5mN7CYIICj5pvkJi8A0Zs Qvn8oiJ+qivoIPKlIyTP =Pm4w -----END PGP SIGNATURE-----

2 1

re: winegcc preprocessor macro containing wine version?
by Dan Kegel March 8, 2011

March 8, 2011

Robert McDonald asked: > I want to be able to define a structure if I'm compiling with Wine 1.2.2 > but not with Wine 1.3.15, since the structure definition exists in the > latter but not the former. Is there a preprocessor macro pre-defined by > winegcc that holds the Wine version? #include "config.h" gives you PACKAGE_VERSION, but that's a string. Looking at 'git blame commctrl.h, I see that MCM_SETCALENDARBORDER is a preprocessor symbol of similar vintage to TASKDIALOG_BUTTON, testing for that should suffice. (But Wine doesn't implement task dialogs, hope you're not expecting them to work. There has been some interest in implementing it, and some code is floating around, but I haven't heard anything concrete yet.) - Dan

2 1

winealsa.drv: Waveout rewrite to allow multiple waveopens
by Joerg-Cyril.Hoehle＠t-systems.com March 8, 2011

March 8, 2011

Maarten, let me apologize for barely taking the time to look at the extra patches you write outside of the main git tree. I hope other people find more time to try them out with real apps and report on their findings. Here are a few comments of mine on your winealsa rewrite (beside bug #22261, comment #6). - It's been a pleasure to hear mciwave+winealsa open multiple devices concurrently with dmix mixing all playing sounds thanks to this rewrite. - wodNotifyDoneList is called from within a critical section in wodTick(). This may break havoc with DCB_FUNCTION callbacks, as the driver does not appear to be re-entrant. EnterCriticalSection offers no protection from within the same thread. Some apps are known to call waveOutClose() from within the DONE callback. Of course you may delegate this issue to a solution to bug #3930. I'd be curious if you have any ideas about how to delay notification to a later point in time, "until it is safe to do" -- native appears to delay as well. - You may wish to look into bug #22880. Lemmix is a small (143KB) downloadable application that opens two waveout devices. It plays both music and sound effects on Mac OS using the winecoreaudio driver, but fails to do so with your ALSA driver, although both devices open and WINEDEBUG=+wave shows calls to waveOutWrite. I could not figure out what goes wrong. - I've seen old apps ask for ~7000 samples per second. Your limit of 8000 is too high. Here's a patch to use DSBFREQUENCY_* like the other devices do. Lemmix needs it (although I did not investigate why the msacm/pcmconverter did not kick in and resample to a higher frequency). >From 54224dbf35354036934d7791acafe0353cbef7bc Mon Sep 17 00:00:00 2001 From: =?utf-8?q?J=C3=B6rg=20H=C3=B6hle?= <hoehle(a)users.sourceforge.net> Date: Sat, 5 Mar 2011 19:28:00 +0100 Subject: winealsa: Use DSBFREQUENCY_* as lower and upper bounds. --- dlls/winealsa.drv/waveout.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 23560cc..b15164b 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -225,7 +225,7 @@ static DWORD wodGetDevCaps(waveimpl *dev, LPWAVEOUTCAPSW lpCaps, DWORD dwSize) { static snd_pcm_format_t get_format(WAVEFORMATEX *wfx) { WAVEFORMATEXTENSIBLE *wfe = (WAVEFORMATEXTENSIBLE *)wfx; - if (!wfx->nChannels || wfx->nSamplesPerSec < 8000 || wfx->nSamplesPerSec > 192000) + if (!wfx->nChannels || wfx->nSamplesPerSec < DSBFREQUENCY_MIN || wfx->nSamplesPerSec > DSBFREQUENCY_MAX) return SND_PCM_FORMAT_UNKNOWN; if (wfx->wFormatTag == WAVE_FORMAT_PCM) { -- 1.5.6.3 Regards, Jörg Höhle

2 1

winegcc preprocessor macro containing wine version?
by Robert McDonald March 8, 2011

March 8, 2011

I want to be able to define a structure if I'm compiling with Wine 1.2.2 but not with Wine 1.3.15, since the structure definition exists in the latter but not the former. Is there a preprocessor macro pre-defined by winegcc that holds the Wine version? Maybe that's not the best long-term solution but that will help for awhile. #if defined ...? typedef struct tagTASKDIALOG_BUTTON { int nButtonID; ctstr pszButtonText; } TASKDIALOG_BUTTON, MsgBoxOption; #else typedef TASKDIALOG_BUTTON MsgBoxOption; #endif -- Robert McDonald BitTorrent, Inc.

1 0

Re: widl: Pass the switchtype attribute from an alias to the base type
by Alexandre Julliard March 8, 2011

March 8, 2011

Eric Kohl <eric.kohl(a)t-online.de> writes: > Hi, > > this patch ensures that client and server code for non-encapsulated > unions is generated correctly. The switchtype attribute must be passed > to from a type alias to the base type in order to get recognized by > write_union_tfs(). Modifying the base type doesn't seem right. You should add some test cases. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/2] wininet: Partially implement FreeUrlCacheSpaceW.
by Alexandre Julliard March 8, 2011

March 8, 2011

Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> writes: > + if (file == INVALID_HANDLE_VALUE) > + { > + if (GetLastError() == ERROR_SHARING_VIOLATION) > + { > + WCHAR title[128]; > + LoadStringW(WININET_hModule, IDS_CACHE_IN_USE, message, sizeof(message)/sizeof(*message)); > + LoadStringW(WININET_hModule, IDS_WARNING, title, sizeof(title)/sizeof(*title)); > + MessageBoxW(NULL, message, title, MB_OK); > + } I don't think you want to show message boxes, particularly not for such harmless errors. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: wininet(3/7): Account for disk space used by cache
by Alexandre Julliard March 8, 2011

March 8, 2011

Juan Lang <juan.lang(a)gmail.com> writes: > +{ > + ULARGE_INTEGER currentSize, addedSize, limit; > + > + currentSize.u.LowPart = pHeader->dwCacheUsageLow; > + currentSize.u.HighPart = pHeader->dwCacheUsageHigh; > + addedSize.u.HighPart = fileSizeHigh; > + addedSize.u.LowPart = fileSizeLow; > + currentSize.QuadPart += addedSize.QuadPart; > + limit.u.LowPart = pHeader->dwCacheLimitLow; > + limit.u.HighPart = pHeader->dwCacheLimitHigh; > + if (commit) > + { > + pHeader->dwCacheUsageLow = currentSize.u.LowPart; > + pHeader->dwCacheUsageHigh = currentSize.u.HighPart; > + } > + return currentSize.QuadPart > limit.QuadPart; You should store the fields as large integer in the header structure, that would save a lot of redundant manipulations. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [3/3] msi: Assume a file is present if the target exists with the same size and there's no file version or hash to verif
by Marvin March 8, 2011

March 8, 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=9778 Your paranoid android. === WNT4WSSP6 (32 bit install) === install.c:5993: Test failed: Per-user icon file isn't where it's expected (C:\WINNT\Profiles\Default User\Application Data\Microsoft\Installer\{7DF88A49-996F-4EC8-A022-BF956F9B2CBB}\testicon)

1 0

Re: [2/3] msi: Load media info even if there's no file to install.
by Marvin March 8, 2011

March 8, 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=9777 Your paranoid android. === WNT4WSSP6 (32 bit install) === install.c:5958: Test failed: Per-user icon file isn't where it's expected (C:\WINNT\Profiles\Default User\Application Data\Microsoft\Installer\{7DF88A49-996F-4EC8-A022-BF956F9B2CBB}\testicon)

1 0