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

re: msvcp90: handle npos as a len in basic_string<>::replace
by Dan Kegel 16 Jul '12

16 Jul '12

Daniel Lehman wrote: @@ -1949,7 +1949,7 @@ basic_string_char* __thiscall basic_string_char_replace_cstr_len(basic_string_ch - if(off+len > this->size) + if(off+len < off || off+len > this->size) len = this->size-off; Wouldn't this be more elegant: if(num > this->size-pos) num = this->size-pos; ? Also, you may have missed the similar case in basic_string_char_compare_substr_cstr_len (which uses 'pos' and 'num' rather than 'off' and 'len'). See http://bugs.winehq.org/show_bug.cgi?id=31085#c5

2 1

Build failure of "[PATCH 5/5] kernel32/tests: Add a IOCTL_DVD_READ_STRUCTURE (DvdManufacturerDescriptor) test (try 4)" ?
by GOUJON Alexandre 16 Jul '12

16 Jul '12

Hi, My patch (http://source.winehq.org/patches/data/88072) is marked as "Build failure". I tried with the latest (today) HEAD and I successfully applied it. Compilation also works for me at least on my x86 and x86_64 computers. Moreover, the Wine Test Bot tested it without any issue, see https://testbot.winehq.org/JobDetails.pl?Key=19936. I know your machine is a bit "mystic". Can you show me your output to help me diagnosing your build failure ? Thanks

2 2

Re: msi/tests: Mark some test results as broken.
by Marvin 16 Jul '12

16 Jul '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=20071 Your paranoid android. === WNT4WSSP6 (32 bit install) === install.c:6053: 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: kernel32: Also report empty drives as available in GetLogicalDrives
by Alexandre Julliard 16 Jul '12

16 Jul '12

Alexandre Goujon <ale.goujon(a)gmail.com> writes: > --- > dlls/kernel32/volume.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c > index 8377e41..67e2eb1 100644 > --- a/dlls/kernel32/volume.c > +++ b/dlls/kernel32/volume.c > @@ -1441,19 +1441,26 @@ DWORD WINAPI GetLogicalDrives(void) > DWORD ret = 0; > int i; > > - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, strlen(config_dir) + sizeof("/dosdevices/a:") ))) > + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, strlen(config_dir) + sizeof("/dosdevices/a::") ))) > { > SetLastError( ERROR_NOT_ENOUGH_MEMORY ); > return 0; > } > strcpy( buffer, config_dir ); > - strcat( buffer, "/dosdevices/a:" ); > - dev = buffer + strlen(buffer) - 2; > + strcat( buffer, "/dosdevices/a::" ); > + dev = buffer + strlen(buffer) - 3; > > for (i = 0; i < 26; i++) > { > *dev = 'a' + i; > + dev[2] = 0; > if (!stat( buffer, &st )) ret |= (1 << i); > + /* Windows also report empty drives as available */ > + else > + { > + dev[2] = ':'; > + if (!stat( buffer, &st )) ret |= (1 << i); > + } You can't do that, the device symlinks don't reflect the availability of the drive. It would have to go through the mountmgr. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/9] hhctrl.ocx: Centralize merging HH_WINTYPE data (resend).
by Alexandre Julliard 16 Jul '12

16 Jul '12

"Erich E. Hoover" <ehoover(a)mymail.mines.edu> writes: > @@ -28,6 +28,13 @@ > > WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); > > +#define HHWIN_PARAM_MASK (HHWIN_PARAM_PROPERTIES|HHWIN_PARAM_STYLES|HHWIN_PARAM_EXSTYLES|HHWIN_PARAM_RECT\ > + |HHWIN_PARAM_NAV_WIDTH|HHWIN_PARAM_SHOWSTATE|HHWIN_PARAM_INFOTYPES\ > + |HHWIN_PARAM_TB_FLAGS|HHWIN_PARAM_EXPANSION|HHWIN_PARAM_TABPOS\ > + |HHWIN_PARAM_TABORDER|HHWIN_PARAM_HISTORY_COUNT|HHWIN_PARAM_CUR_TAB) > +#define MERGE_PARAM(s,d,o,p) ((s->fsValidMembers & p) && (!(d->fsValidMembers & p) || o)) > +#define MERGE_PROP(s,d,o,p) (s->p != 0 && (d->p == 0 || o)) These macros are fairly ugly, you should be able to do without that. > @@ -1752,16 +1752,16 @@ void ReleaseHelpViewer(HHInfo *info) > list_remove(&info->entry); > > /* Free allocated strings */ > - heap_free(info->pszType); > - heap_free(info->pszCaption); > - heap_free(info->pszToc); > - heap_free(info->pszIndex); > - heap_free(info->pszFile); > - heap_free(info->pszHome); > - heap_free(info->pszJump1); > - heap_free(info->pszJump2); > - heap_free(info->pszUrlJump1); > - heap_free(info->pszUrlJump2); > + heap_free((LPVOID)info->WinType.pszType); > + heap_free((LPVOID)info->WinType.pszCaption); > + heap_free((LPVOID)info->WinType.pszToc); > + heap_free((LPVOID)info->WinType.pszIndex); > + heap_free((LPVOID)info->WinType.pszFile); > + heap_free((LPVOID)info->WinType.pszHome); > + heap_free((LPVOID)info->WinType.pszJump1); > + heap_free((LPVOID)info->WinType.pszJump2); > + heap_free((LPVOID)info->WinType.pszUrlJump1); > + heap_free((LPVOID)info->WinType.pszUrlJump2); Don't do that. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 6/6] jscript: Don't set constructor property to each object instance, it belongs to their prototypes
by Marvin 16 Jul '12

16 Jul '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=20070 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 5/6] jscript: Expose RegExpError constructor in global object
by Marvin 16 Jul '12

16 Jul '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=20069 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 4/6] jscript: Properly set Error object's constructor property
by Marvin 16 Jul '12

16 Jul '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=20068 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 3/6] jscript: Properly set Function constructor's constructor property
by Marvin 16 Jul '12

16 Jul '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=20067 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 2/6] jscript: Properly handle constructor property for most builtin constructors
by Marvin 16 Jul '12

16 Jul '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=20066 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0