October 2011 - Wine-Devel - list.winehq.org

Re: cmd: Avoid mixing signed and unsigned type in conditional expression

by Frédéric Delanoy

On Thu, Oct 27, 2011 at 08:38, Eric Pouech <eric.pouech(a)orange.fr> wrote: > why do we check for ptr being null or not, when we deref ptr one line above? >> if (*ptr == '\n') ptr++; >> - WCMD_output_asis_len(message, (ptr) ? ptr - message : >> strlenW(message), handle); >> + WCMD_output_asis_len(message, (ptr) ? (DWORD)(ptr - message) : >> strlenW(message), handle); >> if (ptr) { >> numChars = 0; >> if (++line_count >= max_height - 1) { It's dereferenced but incremented afterwards, so might be null after that line

Oct. 27, 2011

Re: basic_ifstream implementation

by Piotr Caban

On 10/27/11 2:01 AM, Josh Juran wrote: > On Oct 26, 2011, at 11:59 AM, Josh Juran wrote: > >> I'm ready to begin work on a basic_ifstream implementation for Wine, which is needed for the game Vampire Secrets among others. In order to implement it correctly lots of functions/classes needs to be implemented first. I've started stubbing some of them but there's still lots to be done. >> Well, it turns out that the game creates an ifstream for its intro movie and then uses a completely different mechanism to read from it. Defining a (nearly) empty constructor and destructor for basic_ifstream<char> was sufficient to make things work. It may happen because of inlining some functions. The game may also use created streams later. >> +static const vtable_ptr basic_ifstream_char_vtable; >> + >> +typedef struct _basic_ifstream_char >> +{ >> + const vtable_ptr *vtable; >> + >> + int filler[ 140 / sizeof (int) - sizeof (const vtable_ptr*) ]; >> +} >> +basic_ifstream_char; It's not good to add an incomplete structure. We'll end having lots of bugs that will need to be debugged to find where the problem is. Especially adding uninitialized vtable pointer is not a good idea. I think it should be implemented by adding all fstream class dependencies first. Thanks to it it will be possible to create a complete basic_ifstream_char structure. >> +basic_ifstream_char* __thiscall basic_ifstream_char_ctor(basic_ifstream_char *this, const char *path, int mode, int prot) >> +@ thiscall -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDHH@Z(ptr long long) basic_ifstream_char_ctor Arguments in spec file are different then in ios.c. Cheers, Piotr

Oct. 27, 2011

Re: cmd: Avoid mixing signed and unsigned type in conditional expression

by Eric Pouech

why do we check for ptr being null or not, when we deref ptr one line above ? something's wrong in the code logic A+ Le 27 octobre 2011 04:53, Frédéric Delanoy <frederic.delanoy(a)gmail.com> a écrit : > --- > programs/cmd/wcmdmain.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c > index 56aa85f..1bcc598 100644 > --- a/programs/cmd/wcmdmain.c > +++ b/programs/cmd/wcmdmain.c > @@ -278,7 +278,7 @@ static void WCMD_output_asis_handle (DWORD std_handle, > const WCHAR *message) { > ptr++; > }; > if (*ptr == '\n') ptr++; > - WCMD_output_asis_len(message, (ptr) ? ptr - message : > strlenW(message), handle); > + WCMD_output_asis_len(message, (ptr) ? (DWORD)(ptr - message) : > strlenW(message), handle); > if (ptr) { > numChars = 0; > if (++line_count >= max_height - 1) { > -- > 1.7.7.1 > > > > -- -- Eric Pouech

Oct. 27, 2011

Re: basic_ifstream implementation

by Octavian Voicu

On Thu, Oct 27, 2011 at 2:01 AM, Josh Juran <josh(a)iswifter.net> wrote: > @ stub -arch=win64 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDHH@Z > @ stub -arch=win64 ??_D?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ You forgot to update the win64 stubs in the spec file. Octavian

Oct. 27, 2011

Re: basic_ifstream implementation

by Josh Juran

On Oct 26, 2011, at 11:59 AM, Josh Juran wrote: > I'm ready to begin work on a basic_ifstream implementation for Wine, which is needed for the game Vampire Secrets among others. > > http://bugs.winehq.org/show_bug.cgi?id=28612 > > First I'd like to check that Piotr isn't already working on this. If not, I'm open to any advice on how to proceed. My plan is to create fstream.c, and use string.c as a guide. Well, it turns out that the game creates an ifstream for its intro movie and then uses a completely different mechanism to read from it. Defining a (nearly) empty constructor and destructor for basic_ifstream<char> was sufficient to make things work. The good news is that this ticket can be resolved if the patch attached to it and included below (or one like it) is applied. The bad news is that I won't be providing an actual implementation or otherwise working on this any further. Josh diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 84dfb17..4290469 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -1727,3 +1727,35 @@ basic_ostream_char* __thiscall basic_ostream_char_write(basic_ostream_char *this FIXME("(%p %s %lu) stub\n", this, debugstr_a(str), count); return NULL; } + +static const vtable_ptr basic_ifstream_char_vtable; + +typedef struct _basic_ifstream_char +{ + const vtable_ptr *vtable; + + int filler[ 140 / sizeof (int) - sizeof (const vtable_ptr*) ]; +} +basic_ifstream_char; + +/* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDHH@Z */ +/* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDHH@Z */ +DEFINE_THISCALL_WRAPPER(basic_ifstream_char_ctor, 16) +basic_ifstream_char* __thiscall basic_ifstream_char_ctor(basic_ifstream_char *this, const char *path, int mode, int prot) +{ + FIXME("(%p, %s, %d, %d) stub\n", this, path, mode, prot); + + this->vtable = &basic_ifstream_char_vtable; + + return this; +} + +/* ??_D?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ */ +/* ??_D?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(basic_ifstream_char_vbase_dtor, 4) +basic_ifstream_char* __thiscall basic_ifstream_char_vbase_dtor(basic_ifstream_char *this) +{ + FIXME("(%p) stub\n", this); + + return this; +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 33d5619..f43a669 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -590,7 +590,7 @@ @ stub -arch=win64 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)XZ @ stub -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PAU_iobuf@@@Z @ stub -arch=win64 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEAU_iobuf@@@Z -@ stub -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDHH@Z +@ thiscall -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDHH@Z(ptr long long) basic_ifstream_char_ctor @ stub -arch=win64 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDHH@Z @ stub -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBGHH@Z @ stub -arch=win64 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBGHH@Z @@ -1907,7 +1907,7 @@ @ stub -arch=win64 ??_D?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXXZ @ stub -arch=win32 ??_D?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXXZ @ stub -arch=win64 ??_D?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXXZ -@ stub -arch=win32 ??_D?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ +@ thiscall -arch=win32 ??_D?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ(ptr) basic_ifstream_char_vbase_dtor @ stub -arch=win64 ??_D?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ @ stub -arch=win32 ??_D?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QAEXXZ @ stub -arch=win64 ??_D?$basic_ifstream(a)GU?$char_traits(a)G@std@@@std@@QEAAXXZ

Oct. 27, 2011

basic_ifstream implementation

by Josh Juran

I'm ready to begin work on a basic_ifstream implementation for Wine, which is needed for the game Vampire Secrets among others. http://bugs.winehq.org/show_bug.cgi?id=28612 First I'd like to check that Piotr isn't already working on this. If not, I'm open to any advice on how to proceed. My plan is to create fstream.c, and use string.c as a guide. Josh

Oct. 26, 2011

Re: winscard/tests: Add the tests file

by Bruno Jesus

On Wed, Oct 26, 2011 at 11:38, Marvin <testbot(a)testbot.winehq.org> wrote: > === W2KPROSP4 (32 bit winscard) === > winscard.c:53: Test failed: SCardIsValidContext expected SCARD_E_INVALID_HANDLE, received 00000006 > winscard.c:64: Test failed: SCardReleaseContext expected SCARD_E_INVALID_HANDLE, received 00000006 > It looks like Win2000 didn't have the SCARD_E_INVALID_HANDLE and instead return the win error INVALID_HANDLE (error 6). If possible and if no one finds any problem with the patch I would ask for it to be commited as is because I'll fix this in a newer patch using broken. Best wishes, Bruno

Oct. 26, 2011

Re: winscard/tests: Add the tests file

by Marvin

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=15123 Your paranoid android. === W2KPROSP4 (32 bit winscard) === winscard.c:53: Test failed: SCardIsValidContext expected SCARD_E_INVALID_HANDLE, received 00000006 winscard.c:64: Test failed: SCardReleaseContext expected SCARD_E_INVALID_HANDLE, received 00000006

Oct. 26, 2011

Re: [PATCH 1/3] widl: teach widl how to automatically create class factories (resend)

by Dan Kegel

On Wed, Oct 26, 2011 at 4:48 AM, Bernhard Loos <bernhardloos(a)googlemail.com> wrote: > This means tools/widl/Makefile wasn't regenerated. > But the changes to Makefile.in are there, so it's a problem with your system. Hmm. Thanks, I'll have a look. - Dan

Oct. 26, 2011

Re: [PATCH 2/2] d3dx9/test: Fix typo.

by Marvin

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

Oct. 26, 2011