June 2012 - Wine-devel - list.winehq.org

Re: [PATCH] loader: On Mac OS, don't emit a __PAGEZERO segment.
by Alexandre Julliard 11 Jun '12

11 Jun '12

Charles Davis <cdavis(a)mymail.mines.edu> writes: > This is the reason we couldn't put the WINE_DOS segment at address 0. We don't need page zero, we don't run DOS apps on the Mac. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/2 resend] wininet: Added InternetGetSecurityInfoByURL tests
by Marvin 11 Jun '12

11 Jun '12

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=18940 Your paranoid android. === W2K8SE (32 bit http) === http.c:533: Test failed: req_error = 12007 http.c:544: Test failed: expected status 11 (INTERNET_STATUS_NAME_RESOLVED) 1 times, received 0 times http.c:557: Test failed: expected status 30 (INTERNET_STATUS_SENDING_REQUEST) 1 times, received 0 times http.c:558: Test failed: expected status 31 (INTERNET_STATUS_REQUEST_SENT) 1 times, received 0 times http.c:559: Test failed: expected status 40 (INTERNET_STATUS_RECEIVING_RESPONSE) 1 times, received 0 times http.c:560: Test failed: expected status 41 (INTERNET_STATUS_RESPONSE_RECEIVED) 1 times, received 0 times http.c:569: Test failed: flags = 8, expected 0 http.c:657: Test failed: Returned zero size in response to request complete http.c:269: Test failed: unexpected status 10 (INTERNET_STATUS_RESOLVING_NAME) http.c:533: Test failed: req_error = 12007 http.c:557: Test failed: expected status 30 (INTERNET_STATUS_SENDING_REQUEST) 2 times, received 0 times http.c:558: Test failed: expected status 31 (INTERNET_STATUS_REQUEST_SENT) 2 times, received 0 times http.c:559: Test failed: expected status 40 (INTERNET_STATUS_RECEIVING_RESPONSE) 2 times, received 0 times http.c:560: Test failed: expected status 41 (INTERNET_STATUS_RESPONSE_RECEIVED) 2 times, received 0 times http.c:562: Test failed: expected status 110 (INTERNET_STATUS_REDIRECT) 1 times, received 0 times http.c:569: Test failed: flags = 8, expected 0 http.c:583: Test failed: Wrong URL http://test.winehq.org/tests/redirect http.c:657: Test failed: Returned zero size in response to request complete http.c:269: Test failed: unexpected status 10 (INTERNET_STATUS_RESOLVING_NAME) http.c:269: Test failed: unexpected status 11 (INTERNET_STATUS_NAME_RESOLVED)

1 0

Re: [PATCH] winepulse.drv: Add PulseAudio driver
by Dmitry Timoshkov 11 Jun '12

11 Jun '12

Andrew Eikum <aeikum(a)codeweavers.com> wrote: > configure.ac | 31 +- > dlls/mmdevapi/main.c | 4 +- > dlls/winepulse.drv/Makefile.in | 9 + > dlls/winepulse.drv/mmdevdrv.c | 3216 +++++++++++++++++++++++++++++++++ > dlls/winepulse.drv/winepulse.drv.spec | 5 + > 5 files changed, 3261 insertions(+), 4 deletions(-) > create mode 100644 dlls/winepulse.drv/Makefile.in > create mode 100644 dlls/winepulse.drv/mmdevdrv.c > create mode 100644 dlls/winepulse.drv/winepulse.drv.spec How does it follow the Alexandre's requirement to split the patch into smaller pieces before submitting? -- Dmitry.

1 0

Re: [PATCH] kernel32: Don't use putenv(3) on temporary strings.
by Ken Thomases 10 Jun '12

10 Jun '12

The putenv() calls occur in a forked grandchild process just before an exec(). The strings are sure to survive the current process image. After that, it's the kernel's problem. Regards, Ken On Jun 10, 2012, at 11:47 AM, Charles Davis wrote: > The Darwin manpage for putenv() warns that it no longer makes a copy of > its input, but directly stores the pointer in environ. Wine was passing > stack- and heap-allocated strings to putenv(), which could have caused a > crash. We were very lucky it didn't. Instead, use setenv(3), which still > copies its inputs. > > Found while tracking down an insidious bug in Clang-built optimized > (-O2) Wine. > --- > dlls/kernel32/process.c | 24 +++++++++++------------- > 1 files changed, 11 insertions(+), 13 deletions(-) > > diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c > index 42716c2..1ec3e3d 100644 > --- a/dlls/kernel32/process.c > +++ b/dlls/kernel32/process.c > @@ -1741,17 +1741,14 @@ static const char *get_alternate_loader( char **ret_env ) > int len = strlen( loader_env ); > if (!is_win64) > { > - if (!(env = HeapAlloc( GetProcessHeap(), 0, sizeof("WINELOADER=") + len + 2 ))) return NULL; > - strcpy( env, "WINELOADER=" ); > - strcat( env, loader_env ); > + if (!(env = HeapAlloc( GetProcessHeap(), 0, len + 2 ))) return NULL; > + strcpy( env, loader_env ); > strcat( env, "64" ); > } > else > { > - if (!(env = HeapAlloc( GetProcessHeap(), 0, sizeof("WINELOADER=") + len ))) return NULL; > - strcpy( env, "WINELOADER=" ); > - strcat( env, loader_env ); > - len += sizeof("WINELOADER=") - 1; > + if (!(env = HeapAlloc( GetProcessHeap(), 0, len ))) return NULL; > + strcpy( env, loader_env ); > if (!strcmp( env + len - 2, "64" )) env[len - 2] = 0; > } > if (!loader) > @@ -1860,14 +1857,14 @@ static pid_t exec_loader( LPCWSTR cmd_line, unsigned int flags, int socketfd, > /* Reset signals that we previously set to SIG_IGN */ > signal( SIGPIPE, SIG_DFL ); > > - sprintf( socket_env, "WINESERVERSOCKET=%u", socketfd ); > - sprintf( preloader_reserve, "WINEPRELOADRESERVE=%lx-%lx", > + sprintf( socket_env, "%u", socketfd ); > + sprintf( preloader_reserve, "%lx-%lx", > (unsigned long)binary_info->res_start, (unsigned long)binary_info->res_end ); > > - putenv( preloader_reserve ); > - putenv( socket_env ); > - if (winedebug) putenv( winedebug ); > - if (wineloader) putenv( wineloader ); > + setenv( "WINESERVERSOCKET", socket_env, 1 ); > + setenv( "WINEPRELOADRESERVE", preloader_reserve, 1 ); > + if (winedebug) setenv( "WINEDEBUG", winedebug, 1 ); > + if (wineloader) setenv( "WINELOADER", wineloader, 1 ); > if (unixdir) chdir(unixdir); > > if (argv) > @@ -1976,6 +1973,7 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW > static const WCHAR WINEDEBUG[] = {'W','I','N','E','D','E','B','U','G','=',0}; > if (!winedebug && !strncmpW( env_end, WINEDEBUG, sizeof(WINEDEBUG)/sizeof(WCHAR) - 1 )) > { > + env_end += sizeof(WINEDEBUG)/sizeof(WCHAR) - 1; > DWORD len = WideCharToMultiByte( CP_UNIXCP, 0, env_end, -1, NULL, 0, NULL, NULL ); > if ((winedebug = HeapAlloc( GetProcessHeap(), 0, len ))) > WideCharToMultiByte( CP_UNIXCP, 0, env_end, -1, winedebug, len, NULL, NULL ); > -- > 1.7.5.4 > > >

1 0

Re: [PATCH 4/4] kernel32/tests: Add a IOCTL_DVD_READ_STRUCTURE (DvdCopyrightDescriptor) test
by Marvin 10 Jun '12

10 Jun '12

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=18927 Your paranoid android. === W2KPROSP4 (32 bit cdrom) === cdrom.c:85: Test failed: IOCTL_DVD_READ_STRUCTURE (DvdPhysicalDescriptor) failed, last error = 87

1 0

Re: [PATCH 3/4] kernel32/tests: Add a IOCTL_DVD_READ_STRUCTURE (DvdPhysicalDescriptor) test
by Marvin 10 Jun '12

10 Jun '12

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=18926 Your paranoid android. === W2KPROSP4 (32 bit cdrom) === cdrom.c:84: Test failed: IOCTL_DVD_READ_STRUCTURE (DvdPhysicalDescriptor) failed, last error = 87

1 0

Re: [PATCH 1/5] hhctrl.ocx: Add HTML to Unicode parsing capability.
by Jacek Caban 10 Jun '12

10 Jun '12

Hi Erich, On 06/07/12 23:09, Erich E. Hoover wrote: > + /* Post the HTML text to the document */ > + array = SafeArrayCreateVector(VT_VARIANT, 0, 1); > + if(!array) > + goto cleanup; > + hr = SafeArrayAccessData(array, (LPVOID*)&array_param); > + if (FAILED(hr)) > + goto cleanup; > + V_VT(array_param) = VT_BSTR; > + V_BSTR(array_param) = SysAllocString(html_fragment); > + hr = SafeArrayUnaccessData(array); > + if (FAILED(hr)) > + goto cleanup; > + hr = IHTMLDocument2_write(html_parsing_doc, array); Did you test indexes like '<script>alert("really!?")</script>' ? :) Seriously, HTMLDocument is not the right tool for the job. Cheers, Jacek

2 4

Re: Patch 1/2 - [scrrun] - Add initial support for Dictionary - try 2
by Jacek Caban 10 Jun '12

10 Jun '12

Hi Vijay, On 06/08/12 03:15, Vijay Kiran Kamuju wrote: > + *ppvObject = NULL; > + if ( IsEqualGUID( riid, &IID_IDictionary ) || > + IsEqualGUID( riid, &IID_IPersist ) || > + IsEqualGUID( riid, &IID_IDispatch ) || > + IsEqualGUID( riid, &IID_IUnknown ) ) > + { > + *ppvObject = This; > + } That's not the right way to cast object to interface. See http://wiki.winehq.org/COMGuideline Cheers, Jacek

2 2

joy.cpl icon
by Joel Holdsworth 10 Jun '12

10 Jun '12

Hi All, I've just submitted an icon for joy.cpl to wine-patches. Unfortunatly I've uncovered a problem with the buildimage script. When I first wrote the script, I used the "rsvg" command to convert svg to png. rsvg has been depreciated in favour of rsvg-convert, which has slightly different semantics: rsvg-convert in.svg > out.png instead of rsvg in.svg out.png Moving over to rsvg-convert is trivial of course, except one question. Is it present on enough platforms? I'm using Ubunut 12.04. Is maintainer mode meant to work on Debian Squeeze? We could support both, but I'd rather not do that. Joel

2 1

re: iphlpapi: Don't rely on the HAVE_XXX macros having a numeric values.
by Dan Kegel 08 Jun '12

08 Jun '12

-#elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) && (HAVE_STRUCT_IPSTAT_IPS_TOTAL || HAVE_STRUCT_IP_STATS_IPS_TOTAL) +#elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) && (defined(HAVE_STRUCT_IPSTAT_IPS_TOTAL) || defined(HAVE_STRUCT_IP_STATS_IPS_TOTAL)) Isn't this a no-op? I thought that an undefined symbol was treated as false by the preprocessor. When I compile #if defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) && (HAVE_STRUCT_IPSTAT_IPS_TOTAL || HAVE_STRUCT_IP_STATS_IPS_TOTAL) defined #else not defined #endif with gcc -E or cl /E, I get not defined

3 4