- wine-devel - winehq.org

Re: kernel32/tests: Add test for FindFirstFileA() (try 2)
by Marvin 04 Jan '14

04 Jan '14

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3973 Your paranoid android. === wxppro (32 bit file) === file.c:2452: Test failed: FindFirstFile failed, Error number 0 === wvista (32 bit file) === file.c:2452: Test failed: FindFirstFile failed, Error number 0 === w2008s64 (32 bit file) === file.c:2452: Test failed: FindFirstFile failed, Error number 0 === w7pro64 (32 bit file) === file.c:2452: Test failed: FindFirstFile failed, Error number 0 === w2008s64 (64 bit file) === file.c:2452: Test failed: FindFirstFile failed, Error number 0 === w7pro64 (64 bit file) === file.c:2452: Test failed: FindFirstFile failed, Error number 0

1 0

Re: ntdll/tests: Add test for deleting via NtOpenFile
by Marvin 04 Jan '14

04 Jan '14

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3962 Your paranoid android. === w7pro64 (32 bit file) === file.c:331: Test failed: open L"system32" failed c000003b file.c:338: Test failed: open L"SYSTEM32" failed c000003b file.c:346: Test failed: open L"\\SYSTEM32" failed c0000034 file.c:356: Test failed: open L"\\SYSTEM32" failed c000003b

2 1

Re: [PATCH 5/5] d3dx9_36/tests: Use NAN.
by Francois Gouget 03 Jan '14

03 Jan '14

On Thu, 2 Jan 2014, Stefan Dösinger wrote: [...] > --- a/dlls/d3dx9_36/tests/mesh.c > +++ b/dlls/d3dx9_36/tests/mesh.c > @@ -4800,7 +4800,7 @@ static void test_create_skin_info(void) [...] > - exp_weights[1] = 0.0f / 0.0f; /* NAN */ > + exp_weights[1] = NAN; This patch breaks the compilation on Solaris because it does not define NAN (except in math_c99.h but we cannot use that, see below). But independently from that I think it's wrong because one should be able to compile the conformance tests on Windows. This means we cannot use things like config.h or port.h and should only use stuff that's defined in Windows headers. But as far as I can tell the Windows SDK does not define NAN. There is a definition of NAN in the CRT xmath.h header but Wine does not have that header and we're obviously not including it here. So one solution would be to revert the patch. Another would be to copy wine/port.h's __port_nan() definition. Yet another might be to add xmath.h and a dependency on msvcrt.dll. But maybe there's a better way still? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ The nice thing about meditation is that it makes doing nothing quite respectable -- Paul Dean

2 2

Re: strmbase: Store BasePinFuncTable inside Base*PinFuncTable structs.
by Alexandre Julliard 03 Jan '14

03 Jan '14

Jacek Caban <jacek(a)codeweavers.com> writes: > --- > dlls/amstream/mediastreamfilter.c | 15 +++++++-------- > dlls/qcap/avico.c | 32 ++++++++++++++------------------ > dlls/qcap/avimux.c | 32 ++++++++++++++------------------ > dlls/qcap/vfwcapture.c | 15 +++++++-------- > dlls/quartz/filesource.c | 15 +++++++-------- > dlls/quartz/parser.c | 15 +++++++-------- > dlls/strmbase/pin.c | 24 ++++++++++++------------ > dlls/strmbase/renderer.c | 17 ++++++++--------- > dlls/strmbase/transform.c | 30 ++++++++++++++---------------- > include/wine/strmbase.h | 7 +++++-- > 10 files changed, 95 insertions(+), 107 deletions(-) There are other users, like winegstreamer and wineqtdecoder. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: kernel32/tests: Add test for FindFirstFileA()
by Marvin 03 Jan '14

03 Jan '14

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3963 Your paranoid android. === wxppro (32 bit file) === file.c:2452: Test failed: FindFirstFile on C:\fooD.tmp should Fail file.c:2453: Test failed: Bad Error number 0 file.c:2459: Test failed: Bad Error number 267 === wvista (32 bit file) === file.c:2452: Test failed: FindFirstFile on C:\fooFB6A.tmp should Fail file.c:2453: Test failed: Bad Error number 0 file.c:2459: Test failed: Bad Error number 267 === w2008s64 (32 bit file) === file.c:2452: Test failed: FindFirstFile on C:\foo9FA.tmp should Fail file.c:2453: Test failed: Bad Error number 0 file.c:2459: Test failed: Bad Error number 267 === w7pro64 (32 bit file) === file.c:2452: Test failed: FindFirstFile on C:\foo580A.tmp should Fail file.c:2453: Test failed: Bad Error number 0 file.c:2459: Test failed: Bad Error number 267 === w2008s64 (64 bit file) === file.c:2452: Test failed: FindFirstFile on C:\foo93F.tmp should Fail file.c:2453: Test failed: Bad Error number 0 file.c:2459: Test failed: Bad Error number 267 === w7pro64 (64 bit file) === file.c:2452: Test failed: FindFirstFile on C:\fooF4B6.tmp should Fail file.c:2453: Test failed: Bad Error number 0 file.c:2459: Test failed: Bad Error number 267

1 0

Re: [PATCH 4/5] scrrun: Implement IEnumVARIANT stub for folder collection (try2)
by Dmitry Timoshkov 03 Jan '14

03 Jan '14

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > +static inline ULONG get_refcount(IUnknown *iface) > +{ > + ULONG ref = IUnknown_AddRef(iface); > + IUnknown_Release(iface); > + return ref-1; > +} This one still looks somewhat strange. Why not do something more straightforward like the following one? static inline ULONG get_refcount(IUnknown *iface) { IUnknown_AddRef(iface); return IUnknown_Release(iface); } -- Dmitry.

1 0

Re: [PATCH 4/5] scrrun: Implement IEnumVARIANT stub for folder collection
by Dmitry Timoshkov 03 Jan '14

03 Jan '14

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > +static inline ULONG get_refcount(IUnknown *iface) > +{ > + ULONG ref = IUnknown_AddRef(iface); > + IUnknown_Release(iface); > + return ref; > +} This implementation may lead to wrong conclusions. -- Dmitry.

2 3

How to bisect the 1.6.x series of commits
by Alan W. Irwin 03 Jan '14

03 Jan '14

I have bisected Wine regressions several times in the last year following the cookbook in http://wiki.winehq.org/RegressionTesting. Those bisections were for the principal branch (or whatever you call it) of development. How do you do similar bisections for the branch of development from 1.6 to 1.6.1? I need the name of that branch of development and how you specify it to the bisect process. Sorry for the git newbie question, but following the above cookbook has been essentially my only git experience to date. The reason I am asking about bisecting from 1.6 to 1.6.1 is I have recently found some fairly strong evidence that there is an important regression in behavior between 1.6-rc4 and 1.6.1. I have used Wine 1.6-rc4 with a lot of success as a test platform for MinGW/MSYS PLplot builds and tests, but when I recently tried 1.6.1, my usual parallel tests of PLplot software failed with an error indicating plot devices (small dll's) cannot be dynamically loaded by the PLplot principal library for that version of Wine. (The problem disappears if I do the tests sequentially for 1.6.1, but I obviously want to avoid that method of testing because it doubles the test time for my two-cpu PC.) The tests of 1.6-rc4 and 1.6.1 were quite similar but not absolutely identical so I do have to confirm the regression in behaviour for 1.6.1 with absolutely identical tests. But assuming I can do that, then I still have to discover if the problem occurred for 1.6. If so, the bisection needs to be an ordinary principal branch one that I am already familiar with between 1.6-rc4 and 1.6, but if not it needs to follow the 1.6.x development branch between 1.6 an 1.6.1. Alan __________________________ Alan W. Irwin Astronomical research affiliation with Department of Physics and Astronomy, University of Victoria (astrowww.phys.uvic.ca). Programming affiliations with the FreeEOS equation-of-state implementation for stellar interiors (freeeos.sf.net); the Time Ephemerides project (timeephem.sf.net); PLplot scientific plotting software package (plplot.sf.net); the libLASi project (unifont.org/lasi); the Loads of Linux Links project (loll.sf.net); and the Linux Brochure Project (lbproject.sf.net). __________________________ Linux-powered Science __________________________

4 4

Re: advapi32/tests: Use BOOL type where appropriate
by Dmitry Timoshkov 03 Jan '14

03 Jan '14

Frédéric Delanoy <frederic.delanoy(a)gmail.com> wrote: > diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c > index 9f1e611..232a729 100644 > --- a/dlls/advapi32/tests/security.c > +++ b/dlls/advapi32/tests/security.c > @@ -4526,13 +4526,14 @@ static void test_mutex_security(HANDLE token) > STANDARD_RIGHTS_ALL | MUTEX_ALL_ACCESS }; > static const struct > { > - int todo, generic, mapped; > + BOOL todo; > + int generic, mapped; > } map[] = > { > - { 1, GENERIC_READ, STANDARD_RIGHTS_READ | MUTANT_QUERY_STATE }, > - { 0, GENERIC_WRITE, STANDARD_RIGHTS_WRITE }, > - { 0, GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE }, > - { 0, GENERIC_ALL, STANDARD_RIGHTS_ALL | MUTANT_QUERY_STATE } > + { TRUE, GENERIC_READ, STANDARD_RIGHTS_READ | MUTANT_QUERY_STATE }, > + { FALSE, GENERIC_WRITE, STANDARD_RIGHTS_WRITE }, > + { FALSE, GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE }, > + { FALSE, GENERIC_ALL, STANDARD_RIGHTS_ALL | MUTANT_QUERY_STATE } > }; Please don't touch these tests, 'int' is intentionally used here, and 'BOOL' buys you nothing. It's better to actually fix the source of these todos and remove them altogether. -- Dmitry.

1 0

Re: ddraw/tests: Use BOOL type where appropriate
by Marvin 03 Jan '14

03 Jan '14

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3950 Your paranoid android. === wxppro (32 bit d3d) === d3d.c:1261: Test failed: Homogeneous output was generated despite UNCLIPPED flag === wvista (32 bit d3d) === d3d.c:1261: Test failed: Homogeneous output was generated despite UNCLIPPED flag === w2008s64 (32 bit d3d) === d3d.c:1261: Test failed: Homogeneous output was generated despite UNCLIPPED flag === w7pro64 (32 bit d3d) === d3d.c:1261: Test failed: Homogeneous output was generated despite UNCLIPPED flag

1 0

Re: [PATCH] ntdll: Improve handling of THUMB_MOV32 relocations
by André Hentschel 02 Jan '14

02 Jan '14

Am 02.01.2014 17:01, schrieb Martin Storsjo: > Since the delta variable actually is signed, the delta > 0xffff > condition could be false even if the high part of the delta > was nonzero, ending up with not updating the high half of the > relocation at all. > > Additionally, carry any overflow from the low word into the > high word delta. Hi, Do you have an App that triggers that? So you mean the case when the sign bit is used, e.g. 10101010b... Then the delta is negative, but is everything set correctly in the instruction? > --- > dlls/ntdll/loader.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c > index e0907e7..1f13424 100644 > --- a/dlls/ntdll/loader.c > +++ b/dlls/ntdll/loader.c > @@ -2230,19 +2230,19 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count > DWORD inst = *(INT_PTR *)((char *)page + offset); > DWORD imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + > ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x00ff); > + int hi_delta; Why you're using int here? DWORD looks much better for this.

2 2

Re: msvcp80: Fix ostreambuf_iterator<char> structure definition
by Alexandre Julliard 02 Jan '14

02 Jan '14

Piotr Caban <piotr(a)codeweavers.com> writes: > --- > dlls/msvcp90/ios.c | 88 > +++++++++++++++++++++++++++++++++++++------------- > dlls/msvcp90/msvcp90.h | 6 ++++ > 2 files changed, 72 insertions(+), 22 deletions(-) It breaks the Mingw build: locale.o:locale.c:(.text+0x94c): undefined reference to `_num_put_char_do_put_long@28' locale.o:locale.c:(.text+0x954): undefined reference to `_num_put_char_put_long@28' locale.o:locale.c:(.text+0x95c): undefined reference to `_num_put_char_do_put_ulong@28' locale.o:locale.c:(.text+0x964): undefined reference to `_num_put_char_put_ulong@28' locale.o:locale.c:(.text+0x96c): undefined reference to `_num_put_char_do_put_double@32' locale.o:locale.c:(.text+0x974): undefined reference to `_num_put_char_put_double@32' locale.o:locale.c:(.text+0x97c): undefined reference to `_num_put_char_put_ldouble@32' locale.o:locale.c:(.text+0x984): undefined reference to `_num_put_char_do_put_ptr@28' locale.o:locale.c:(.text+0x98c): undefined reference to `_num_put_char_put_ptr@28' locale.o:locale.c:(.text+0x994): undefined reference to `_num_put_char_do_put_int64@32' locale.o:locale.c:(.text+0x99c): undefined reference to `_num_put_char_put_int64@32' locale.o:locale.c:(.text+0x9a4): undefined reference to `_num_put_char_do_put_uint64@32' locale.o:locale.c:(.text+0x9ac): undefined reference to `_num_put_char_put_uint64@32' locale.o:locale.c:(.text+0x9b4): undefined reference to `_num_put_char_do_put_bool@28' locale.o:locale.c:(.text+0x9bc): undefined reference to `_num_put_char_put_bool@28' locale.o:locale.c:(.text+0xa0c): undefined reference to `_num_put_wchar_do_put_long@28' locale.o:locale.c:(.text+0xa14): undefined reference to `_num_put_short_do_put_long@28' locale.o:locale.c:(.text+0xa1c): undefined reference to `_num_put_wchar_put_long@28' locale.o:locale.c:(.text+0xa24): undefined reference to `_num_put_wchar_do_put_ulong@28' locale.o:locale.c:(.text+0xa2c): undefined reference to `_num_put_short_do_put_ulong@28' locale.o:locale.c:(.text+0xa34): undefined reference to `_num_put_wchar_put_ulong@28' locale.o:locale.c:(.text+0xa3c): undefined reference to `_num_put_wchar_do_put_double@32' locale.o:locale.c:(.text+0xa44): undefined reference to `_num_put_short_do_put_double@32' locale.o:locale.c:(.text+0xa4c): undefined reference to `_num_put_wchar_put_double@32' locale.o:locale.c:(.text+0xa54): undefined reference to `_num_put_wchar_put_ldouble@32' locale.o:locale.c:(.text+0xa5c): undefined reference to `_num_put_wchar_do_put_ptr@28' locale.o:locale.c:(.text+0xa64): undefined reference to `_num_put_short_do_put_ptr@28' locale.o:locale.c:(.text+0xa6c): undefined reference to `_num_put_wchar_put_ptr@28' locale.o:locale.c:(.text+0xa74): undefined reference to `_num_put_wchar_do_put_int64@32' locale.o:locale.c:(.text+0xa7c): undefined reference to `_num_put_short_do_put_int64@32' locale.o:locale.c:(.text+0xa84): undefined reference to `_num_put_wchar_put_int64@32' locale.o:locale.c:(.text+0xa8c): undefined reference to `_num_put_wchar_do_put_uint64@32' locale.o:locale.c:(.text+0xa94): undefined reference to `_num_put_short_do_put_uint64@32' locale.o:locale.c:(.text+0xa9c): undefined reference to `_num_put_wchar_put_uint64@32' locale.o:locale.c:(.text+0xaa4): undefined reference to `_num_put_wchar_do_put_bool@28' locale.o:locale.c:(.text+0xaac): undefined reference to `_num_put_short_do_put_bool@28' locale.o:locale.c:(.text+0xab4): undefined reference to `_num_put_wchar_put_bool@28' locale.o:locale.c:(.text+0xaec): undefined reference to `_time_put_char_do_put@36' locale.o:locale.c:(.text+0xaf4): undefined reference to `_time_put_char_put@36' locale.o:locale.c:(.text+0xafc): undefined reference to `_time_put_char_put_format@36' locale.o:locale.c:(.text+0xb5c): undefined reference to `_time_put_wchar_do_put@36' locale.o:locale.c:(.text+0xb64): undefined reference to `_time_put_wchar_put@36' locale.o:locale.c:(.text+0xb6c): undefined reference to `_time_put_wchar_put_format@36' collect2: ld returned 1 exit status -- Alexandre Julliard julliard(a)winehq.org

1 0

testbot problem
by Stefan Leichter 02 Jan '14

02 Jan '14

Hello, i'm trying to understand why job 27632 did not build on the testbot. It builds fine for Linux 32/64 bit and Windows (make crosstest) on my computer. From the build log it looks like a problem inside the Makefile (make: Nothing to be done for `all'.). Is there a way to access the Makefile after the job is finished? Regards Stefan

1 0

Better managing icons files names
by Pedro Henrique Lara Campos 02 Jan '14

02 Jan '14

Can Wine or could it in newer versions, use a prefix for their icons, like wine_56BA_Tcharam.png, or maybe their own folder? My ~/.local/share/icons is like... full of bottles, every corner I look, I find an icon from wine :P

3 2

Re: [PATCH] msxml3: avoid double free of str (Coverity)
by Marvin 01 Jan '14

01 Jan '14

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3919 Your paranoid android. === wxppro (32 bit domdoc) === domdoc.c:9860: Test failed: got 00244F94

1 0

Re: [PATCH 12/21] kernel32: conditional variable support (try 6)
by Marcus Meissner 01 Jan '14

01 Jan '14

Hmm, THis should have been patch 0021 instead of 0012 , please disregard. Ciao, Marcus On Wed, Jan 01, 2014 at 07:44:16PM +0100, Marcus Meissner wrote: > Hi, > > Additional tightening and cleaning of comments. > > After Alexandres last guidance ("no global allocation") > and some hours of hair pulling I now did a implementation > with just a linked list of waiters. > > variable->Ptr points to the head of this list. > > The bit 0 of variable->Ptr is used for atomic locking of > the list and also its content, avoiding need for a lock variable. > > Small issues: > We are busy waiting on the bit 0 lock, not the most performance > wise best thing. > > Ciao, Marcus > --- > dlls/kernel32/kernel32.spec | 4 ++ > dlls/kernel32/sync.c | 151 +++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 155 insertions(+) > > diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec > index 7779a75..e8d2bf0 100644 > --- a/dlls/kernel32/kernel32.spec > +++ b/dlls/kernel32/kernel32.spec > @@ -750,6 +750,7 @@ > @ stdcall InitOnceComplete(ptr long ptr) > @ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) > @ stdcall InitOnceInitialize(ptr) ntdll.RtlRunOnceInitialize > +@ stdcall InitializeConditionVariable(ptr) > @ stdcall InitializeCriticalSection(ptr) > @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) > @ stdcall InitializeCriticalSectionEx(ptr long long) > @@ -1194,6 +1195,7 @@ > @ stdcall SignalObjectAndWait(long long long long) > @ stdcall SizeofResource(long long) > @ stdcall Sleep(long) > +@ stdcall SleepConditionVariableCS(ptr ptr long) > @ stdcall SleepEx(long long) > @ stdcall SuspendThread(long) > @ stdcall SwitchToFiber(ptr) > @@ -1263,6 +1265,8 @@ > @ stdcall WaitForSingleObjectEx(long long long) > @ stdcall WaitNamedPipeA (str long) > @ stdcall WaitNamedPipeW (wstr long) > +@ stdcall WakeAllConditionVariable (ptr) > +@ stdcall WakeConditionVariable (ptr) > @ stdcall WerRegisterFile(wstr long long) > @ stdcall WerRegisterMemoryBlock(ptr long) > @ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) > diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c > index 3c9e42a..34f39cd 100644 > --- a/dlls/kernel32/sync.c > +++ b/dlls/kernel32/sync.c > @@ -2327,3 +2327,154 @@ __ASM_STDCALL_FUNC(InterlockedDecrement, 4, > "ret $4") > > #endif /* __i386__ */ > + > +/* See http://locklessinc.com/articles/mutex_cv_futex/ for a futex implementation > + * See http://www.cs.wustl.edu/~schmidt/win32-cv-1.html for various implementations > + * of pthread_cond_* with Win32 primitives. > + * See glibc/nptl/DESIGN-condvar.txt for the glibc implementation > + * > + * This implementation uses a linked list as waiter queue, and the list > + * and its content is locked for access via bit 0 of variable->Ptr. > + * The actual waiting is done using a Win32 Event. > + */ > + > +struct _condvar_intern { > + struct _condvar_intern *next; > + HANDLE event; > +}; > + > +/********************************************************************** > + * InitializeConditionVariable (KERNEL32.@) > + */ > +VOID WINAPI InitializeConditionVariable(PCONDITION_VARIABLE variable) > +{ > + variable->Ptr = NULL; > +} > + > +/* > + * We lock the condition variable by setting bit 0 in variable->Ptr > + * atomically. We busy loop until we succeed and return the current value. > + * We also lock the empty list (NULL). > + * > + * List unlocking is done with "variable->Ptr = <retvalue>" > + */ > +static struct _condvar_intern* > +_lock_list (PCONDITION_VARIABLE variable) { > + struct _condvar_intern *oldvar, *var; > + > + do { > + __asm__ __volatile__("":::"memory"); > + var = variable->Ptr; > + if ((DWORD_PTR)var & 1) continue; /* locked already, retry. */ > + > + oldvar = InterlockedCompareExchangePointer (&variable->Ptr, (void*)((DWORD_PTR)var|1), var); > + if (oldvar == var) > + break; > + /* failed atomic locking, retry. */ > + } while (1); > + return var; > +} > + > +/********************************************************************** > + * WakeConditionVariable (KERNEL32.@) > + */ > +VOID WINAPI WakeConditionVariable(PCONDITION_VARIABLE variable) > +{ > + struct _condvar_intern *var; > + > + if (!variable->Ptr) > + return; > + > + var = _lock_list (variable); > + if (!var) { > + variable->Ptr = NULL; > + return; > + } > + > + /* remove and wake up the first entry */ > + NtSetEvent (var->event, NULL); > + > + variable->Ptr = var->next; > +} > + > +/********************************************************************** > + * WakeAllConditionVariable (KERNEL32.@) > + */ > +VOID WINAPI WakeAllConditionVariable(PCONDITION_VARIABLE variable) > +{ > + struct _condvar_intern *var; > + > + if (!variable->Ptr) > + return; > + > + var = _lock_list (variable); > + > + /* dequeue the whole waiter chain and wake it up */ > + while (var) { > + NtSetEvent (var->event, NULL); > + var = var->next; > + } > + > + variable->Ptr = NULL; > +} > + > +/********************************************************************** > + * SleepConditionVariableCS (KERNEL32.@) > + */ > +BOOL WINAPI SleepConditionVariableCS(PCONDITION_VARIABLE variable, > + LPCRITICAL_SECTION crit, DWORD timeout > +) > +{ > + struct _condvar_intern myself; > + struct _condvar_intern **xvar, *var; > + BOOL ret = TRUE; > + OBJECT_ATTRIBUTES attr; > + DWORD res; > + > + attr.Length = sizeof(attr); > + attr.RootDirectory = 0; > + attr.Attributes = OBJ_INHERIT; > + attr.ObjectName = NULL; > + attr.SecurityDescriptor = NULL; > + attr.SecurityQualityOfService = NULL; > + > + NtCreateEvent (&myself.event, EVENT_ALL_ACCESS, &attr, NotificationEvent, 0); > + myself.next = NULL; > + > + var = _lock_list (variable); > + /* Attach our stack based struct to the end of the list. > + * (at the end for fairness) > + */ > + xvar = &var; > + while (*xvar) > + xvar = &(*xvar)->next; > + *xvar = &myself; > + variable->Ptr = var; > + > + RtlLeaveCriticalSection(crit); > + > + res = WaitForSingleObject(myself.event, timeout); > + > + var = _lock_list (variable); > + > + /* Remove our entry */ > + xvar = (struct _condvar_intern **)&var; > + while (*xvar) { > + if (*xvar == &myself) { > + *xvar = (*xvar)->next; > + break; > + } > + xvar = &(*xvar)->next; > + } > + variable->Ptr = var; > + > + CloseHandle (myself.event); > + RtlEnterCriticalSection(crit); > + > + if (res == WAIT_TIMEOUT) { > + ret = FALSE; > + /* expected from caller, but not set by WaitForSingleObject */ > + SetLastError(ERROR_TIMEOUT); > + } > + return ret; > +} > -- > 1.7.10.4 > > > >

1 0

Re: [PATCH] msxml3: avoid double free of str (Coverity)
by Nikolay Sivov 01 Jan '14

01 Jan '14

On 1/1/2014 22:15, Marcus Meissner wrote: > 1127305 Double free > --- > dlls/msxml3/tests/domdoc.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c > index df11197..f653a8b 100644 > --- a/dlls/msxml3/tests/domdoc.c > +++ b/dlls/msxml3/tests/domdoc.c > @@ -11047,7 +11047,6 @@ static void test_xmlns_attribute(void) > ok( hr == S_OK, "got 0x%08x\n", hr); > todo_wine ok( lstrcmpW(str, _bstr_("<Testing xmlns:dt=\"urn:schemas-microsoft-com:datatypes\" dt:dt=\"bin.base64\"/>")) == 0, > "got %s\n", wine_dbgstr_w(str)); > - SysFreeString(str); This is a correct fix technically, but it's better to remove second SysFreeString(), not this one. Speaking of style, I'd probably remove all 'if (hr == S_OK)' check, it never fails, or reduced a scope of 'str'.

1 0

Re: [PATCH] msxml3: avoid double free of str (Coverity)
by Marvin 01 Jan '14

01 Jan '14

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3918 Your paranoid android. === wxppro (32 bit domdoc) === domdoc.c:9860: Test failed: got 00244F94

1 0

about eventlog
by Akira Nakagawa 01 Jan '14

01 Jan '14

I examined the design of RegistereventSource(). The return value type is HANDLE,but the details of it is unknown. However,I suppose,the code should be like this(I'm not good at coding of Win32) /****************************************************************************** * RegisterEventSourceW [ADVAPI32.@] * * See RegisterEventSourceA. */ HANDLE WINAPI RegisterEventSourceW( LPCWSTR lpUNCServerName, LPCWSTR lpSourceName ) { int arg_length,path_length; LPDWORD existance; LPWSTR reg_fullpath; LPWSTR filename; LPDWORD lptype; LPWSTR lpdata,gldata; HKEY hkeyp; HANDLE eventhandle; int number_of_entry,length_of_dat; FIXME("(%s,%s): stub\n", debugstr_w(lpUNCServerName), debugstr_w(lpSourceName)); if(lpUNCServerName!=NULL) { FIXME("lpUNCServerName:%s\nExecution in another server is not suppported.", debugstr_w(lpUNCServerName)); } else { existance = NULL; number_of_entry = 0; length_of_dat = 0; filename = (LPWSTR)"Application";//FIXME:this should be all of sub keies. reg_fullpath = lstrcatW((LPWSTR)"System\\CurrentControlSet\\Sevices\\Eventlog\\Application\\",lpSourceName); arg_length = lstrlenW(lpSourceName); RegCreateKeyExW(HKEY_LOCAL_MACHINE,reg_fullpath,0, NULL,REG_OPTION_NON_VOLATILE,KEY_READ,NULL,&hkeyp,existance);//Create or open key. RegQueryInfoKeyW(hkeyp,NULL,0,NULL,NULL,NULL,NULL, (LPDWORD)number_of_entry,NULL,(LPDWORD)length_of_dat,NULL,NULL); if(length_of_dat<2 || number_of_entry<2)//Key entry is void. return NULL; *lptype=(REG_SZ); RegQueryValueExW(hkeyp,(LPWSTR)"EventMessageFile",NULL,lptype,(LPBYTE)lpdata,(LPDWORD)path_length); RegCloseKey(hkeyp); eventhandle = GlobalAlloc(GHND,(arg_length+path_length)*sizeof(LPWSTR)); gldata=(LPWSTR)GlobalLock(eventhandle); //After that,store data follows:filename,file path,source name;I do not know how to. if(eventhandle==INVALID_HANDLE_VALUE) { ERR_(eventlog)("%s\n", debugstr_w(lpUNCServerName)); return NULL; } } return eventhandle; }

1 0

Re: [PATCH 3/3] ws2_32: Add an interactive test for interface change notifications (rebased).
by Marvin 01 Jan '14

01 Jan '14

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3915 Your paranoid android. === wxppro (32 bit sock) === sock.c:554: Test failed: oob_server (5a8): unexpectedly at the OOB mark: 0 sock: unhandled exception c0000005 at 71AB4047 === w2008s64 (32 bit sock) === sock.c:554: Test failed: oob_server (750): unexpectedly at the OOB mark: 0 sock: unhandled exception c0000005 at 00000000 === w2008s64 (64 bit sock) === sock.c:554: Test failed: oob_server (654): unexpectedly at the OOB mark: 0 sock: unhandled exception c0000005 at 000007FEFE4C9CD9

1 0

Re: winex11: Implement X11DRV_FLUSH_GDI_DISPLAY ExtEscape command
by Alexandre Julliard 31 Dec '13

31 Dec '13

Sebastian Lackner <sebastian(a)fds-team.de> writes: > This patch implements an additional ExtEscape command > X11DRV_FLUSH_GDI_DISPLAY, which can be used by external applications in > order to flush all drawing operations to the Xserver. > > This patch is necessary for a new feature of Pipelight: In NPAPI > windowlessmode the browser provides an X11 drawable, and expects the > plugin (= the wine application) to draw on it. The current > implementation uses CreateDCA() to create a new hDC and then > X11DRV_SET_DRAWABLE to draw on an arbitrary X11 drawable. The additional > command implemented in this patch is required to ensure that the drawing > is finished before the PAINT event returns. Normally an XSync would be > even better, but a lot of testing shows that XFlush is also sufficient > (and faster), thats why we decided to use this approach. You should call MsgWaitForMultipleObjects or some similar function instead of adding private escapes. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [2/2] ntdll: Dynamically grow buffer in read_changes_apc
by Alexandre Julliard 31 Dec '13

31 Dec '13

André Hentschel <nerv(a)dawncrow.de> writes: > --- > dlls/ntdll/directory.c | 35 +++++++++++++++++++++++++++-------- > 1 file changed, 27 insertions(+), 8 deletions(-) You can't allocate memory inside an APC callback. -- Alexandre Julliard julliard(a)winehq.org

1 0

Status of WineD3D on Windows
by Peter Lehmkuhle 31 Dec '13

31 Dec '13

Hi all, I'm not sure if this is the right list for this question, but I guess I'll find out soon. :) On http://wiki.winehq.org/WineD3DOnWindows it is written that "DirectDraw [..] can't be used at this point due to a conflict with opengl32.dll." I guess that's the current status, because the ddraw.dll is not included in the last build. Are there any plans to change this in the near future? TIA for an answer. Best regards, Peter

2 1

Re: [PATCH 1/4] ole32: Fix parameter validation for CreateClassMoniker()
by Marvin 31 Dec '13

31 Dec '13

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3908 Your paranoid android. === wvista (32 bit moniker) === moniker: unhandled exception c0000005 at 00424509 === w2008s64 (32 bit moniker) === moniker: unhandled exception c0000005 at 00424509 === w7pro64 (32 bit moniker) === moniker: unhandled exception c0000005 at 00424509 === w2008s64 (64 bit moniker) === moniker: unhandled exception c0000005 at 000000000041F2CA === w7pro64 (64 bit moniker) === moniker: unhandled exception c0000005 at 000000000041F2CA

1 0

Re: kernel32/tests: Add test for FindFirstFileA
by Zhenbo Li 31 Dec '13

31 Dec '13

2013/12/30 Zhenbo Li <litimetal(a)gmail.com>: > As MSDN[1] mentioned, "This parameter should not ... end in a trailing > backslash (\)." So I think I should add this test case. > > [1]: > http://msdn.microsoft.com/en-us/library/windows/desktop/aa364418%28v=vs.85%… > --- > dlls/kernel32/tests/file.c | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > Sorry, I made a mistake while reading the previous code. Please reject this patch, and I'll send another patch later. Sorry for this inconvenience.

1 0

Re: winhttp/tests: Constify a character string
by Marvin 31 Dec '13

31 Dec '13

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3905 Your paranoid android. === w7pro64 (32 bit winhttp) === winhttp.c:859: Test failed: failed to send request 12175

1 0

Re: [4/4] ws2_32: Cope with invalid hints in getaddrinfo/GetAddrInfoW
by Marvin 31 Dec '13

31 Dec '13

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3900 Your paranoid android. === wxppro (32 bit sock) === sock.c:554: Test failed: oob_server (c0): unexpectedly at the OOB mark: 0 === wvista (32 bit sock) === sock.c:5410: Test failed: test 0: expected one result when hints are used for localhost sock.c:5410: Test failed: test 1: expected one result when hints are used for localhost sock.c:5410: Test failed: test 2: expected one result when hints are used for localhost sock.c:5410: Test failed: test 3: expected one result when hints are used for localhost sock.c:5410: Test failed: test 8: expected one result when hints are used for localhost sock.c:5410: Test failed: test 9: expected one result when hints are used for localhost sock.c:5410: Test failed: test 10: expected one result when hints are used for localhost sock.c:5410: Test failed: test 11: expected one result when hints are used for localhost sock.c:5410: Test failed: test 20: expected one result when hints are used for localhost sock.c:5410: Test failed: test 21: expected one result when hints are used for localhost sock.c:5518: Test failed: test 0: expected one result when hints are used for localhost sock.c:5518: Test failed: test 1: expected one result when hints are used for localhost sock.c:5518: Test failed: test 2: expected one result when hints are used for localhost sock.c:5518: Test failed: test 3: expected one result when hints are used for localhost sock.c:5518: Test failed: test 8: expected one result when hints are used for localhost sock.c:5518: Test failed: test 9: expected one result when hints are used for localhost sock.c:5518: Test failed: test 10: expected one result when hints are used for localhost sock.c:5518: Test failed: test 11: expected one result when hints are used for localhost sock.c:5518: Test failed: test 20: expected one result when hints are used for localhost sock.c:5518: Test failed: test 21: expected one result when hints are used for localhost === w2008s64 (32 bit sock) === sock.c:554: Test failed: oob_server (750): unexpectedly at the OOB mark: 0 sock.c:5410: Test failed: test 0: expected one result when hints are used for localhost sock.c:5410: Test failed: test 1: expected one result when hints are used for localhost sock.c:5410: Test failed: test 2: expected one result when hints are used for localhost sock.c:5410: Test failed: test 3: expected one result when hints are used for localhost sock.c:5410: Test failed: test 8: expected one result when hints are used for localhost sock.c:5410: Test failed: test 9: expected one result when hints are used for localhost sock.c:5410: Test failed: test 10: expected one result when hints are used for localhost sock.c:5410: Test failed: test 11: expected one result when hints are used for localhost sock.c:5410: Test failed: test 20: expected one result when hints are used for localhost sock.c:5410: Test failed: test 21: expected one result when hints are used for localhost sock.c:5518: Test failed: test 0: expected one result when hints are used for localhost sock.c:5518: Test failed: test 1: expected one result when hints are used for localhost sock.c:5518: Test failed: test 2: expected one result when hints are used for localhost sock.c:5518: Test failed: test 3: expected one result when hints are used for localhost sock.c:5518: Test failed: test 8: expected one result when hints are used for localhost sock.c:5518: Test failed: test 9: expected one result when hints are used for localhost sock.c:5518: Test failed: test 10: expected one result when hints are used for localhost sock.c:5518: Test failed: test 11: expected one result when hints are used for localhost sock.c:5518: Test failed: test 20: expected one result when hints are used for localhost sock.c:5518: Test failed: test 21: expected one result when hints are used for localhost sock: unhandled exception c0000005 at 00000000 === w7pro64 (32 bit sock) === sock.c:5410: Test failed: test 0: expected one result when hints are used for localhost sock.c:5410: Test failed: test 1: expected one result when hints are used for localhost sock.c:5410: Test failed: test 2: expected one result when hints are used for localhost sock.c:5410: Test failed: test 3: expected one result when hints are used for localhost sock.c:5410: Test failed: test 8: expected one result when hints are used for localhost sock.c:5410: Test failed: test 9: expected one result when hints are used for localhost sock.c:5410: Test failed: test 10: expected one result when hints are used for localhost sock.c:5410: Test failed: test 11: expected one result when hints are used for localhost sock.c:5410: Test failed: test 20: expected one result when hints are used for localhost sock.c:5410: Test failed: test 21: expected one result when hints are used for localhost sock.c:5518: Test failed: test 0: expected one result when hints are used for localhost sock.c:5518: Test failed: test 1: expected one result when hints are used for localhost sock.c:5518: Test failed: test 2: expected one result when hints are used for localhost sock.c:5518: Test failed: test 3: expected one result when hints are used for localhost sock.c:5518: Test failed: test 8: expected one result when hints are used for localhost sock.c:5518: Test failed: test 9: expected one result when hints are used for localhost sock.c:5518: Test failed: test 10: expected one result when hints are used for localhost sock.c:5518: Test failed: test 11: expected one result when hints are used for localhost sock.c:5518: Test failed: test 20: expected one result when hints are used for localhost sock.c:5518: Test failed: test 21: expected one result when hints are used for localhost === w2008s64 (64 bit sock) === sock.c:554: Test failed: oob_server (654): unexpectedly at the OOB mark: 0 sock.c:5410: Test failed: test 0: expected one result when hints are used for localhost sock.c:5410: Test failed: test 1: expected one result when hints are used for localhost sock.c:5410: Test failed: test 2: expected one result when hints are used for localhost sock.c:5410: Test failed: test 3: expected one result when hints are used for localhost sock.c:5410: Test failed: test 8: expected one result when hints are used for localhost sock.c:5410: Test failed: test 9: expected one result when hints are used for localhost sock.c:5410: Test failed: test 10: expected one result when hints are used for localhost sock.c:5410: Test failed: test 11: expected one result when hints are used for localhost sock.c:5410: Test failed: test 20: expected one result when hints are used for localhost sock.c:5410: Test failed: test 21: expected one result when hints are used for localhost sock.c:5518: Test failed: test 0: expected one result when hints are used for localhost sock.c:5518: Test failed: test 1: expected one result when hints are used for localhost sock.c:5518: Test failed: test 2: expected one result when hints are used for localhost sock.c:5518: Test failed: test 3: expected one result when hints are used for localhost sock.c:5518: Test failed: test 8: expected one result when hints are used for localhost sock.c:5518: Test failed: test 9: expected one result when hints are used for localhost sock.c:5518: Test failed: test 10: expected one result when hints are used for localhost sock.c:5518: Test failed: test 11: expected one result when hints are used for localhost sock.c:5518: Test failed: test 20: expected one result when hints are used for localhost sock.c:5518: Test failed: test 21: expected one result when hints are used for localhost sock: unhandled exception c0000005 at 000007FEFE4C9CD9 === w7pro64 (64 bit sock) === sock.c:554: Test failed: oob_server (980): unexpectedly at the OOB mark: 0 sock.c:5410: Test failed: test 0: expected one result when hints are used for localhost sock.c:5410: Test failed: test 1: expected one result when hints are used for localhost sock.c:5410: Test failed: test 2: expected one result when hints are used for localhost sock.c:5410: Test failed: test 3: expected one result when hints are used for localhost sock.c:5410: Test failed: test 8: expected one result when hints are used for localhost sock.c:5410: Test failed: test 9: expected one result when hints are used for localhost sock.c:5410: Test failed: test 10: expected one result when hints are used for localhost sock.c:5410: Test failed: test 11: expected one result when hints are used for localhost sock.c:5410: Test failed: test 20: expected one result when hints are used for localhost sock.c:5410: Test failed: test 21: expected one result when hints are used for localhost sock.c:5518: Test failed: test 0: expected one result when hints are used for localhost sock.c:5518: Test failed: test 1: expected one result when hints are used for localhost sock.c:5518: Test failed: test 2: expected one result when hints are used for localhost sock.c:5518: Test failed: test 3: expected one result when hints are used for localhost sock.c:5518: Test failed: test 8: expected one result when hints are used for localhost sock.c:5518: Test failed: test 9: expected one result when hints are used for localhost sock.c:5518: Test failed: test 10: expected one result when hints are used for localhost sock.c:5518: Test failed: test 11: expected one result when hints are used for localhost sock.c:5518: Test failed: test 20: expected one result when hints are used for localhost sock.c:5518: Test failed: test 21: expected one result when hints are used for localhost

1 0

Re: [3/4] ws2_32: Add extended IPX protocol support (try 2, resend)
by Marvin 31 Dec '13

31 Dec '13

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3899 Your paranoid android. === wxppro (32 bit sock) === sock.c:522: Test failed: oob_server (c0): unexpectedly at the OOB mark: 0 sock: unhandled exception c0000005 at 00000000 === w2008s64 (32 bit sock) === sock.c:522: Test failed: oob_server (750): unexpectedly at the OOB mark: 0 sock: unhandled exception c0000005 at 00000000 === w2008s64 (64 bit sock) === sock.c:522: Test failed: oob_server (654): unexpectedly at the OOB mark: 0

1 0

Re: [PATCH 1/6] qcap: Added IPersistPropertyBag::Load implementation.
by Marvin 30 Dec '13

30 Dec '13

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3892 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: msrle32: Added tests.
by Marvin 30 Dec '13

30 Dec '13

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3886 Your paranoid android. === build (build) === Recreation of tests/Makefile failed

1 0

Win32_PnPEntity WMI class
by Luke A. Guest 29 Dec '13

29 Dec '13

Hi, Is anybody working on this at the moment? I need this working for bug 35224. If not, what do I need to be looking at to get this to work? I know nothing about this API tbh. Thanks, Luke.

1 1

Help about implementing WSACleanup (ws2_32)
by Bruno Jesus 29 Dec '13

29 Dec '13

Hi, in an attempt to fix bugs 18670 and 26031 I would like to try implementing WSACleanup more properly. My limited knowledge in the interactions between the ws2_32 dll and wine server makes me think this is easy. The idea is to add the created socket in WSASocketW in a list and remove it from the list when closesocket is called. When the last WSACleanup is called it would iterate through the socket list and destroy the remaining sockets. When WSASocketW is called it calls the server to create the socket, when closesocket is called the server is also called and the function sock_destroy takes care of shutting down the socket. Currently I'm thinking about doing this in the dll side because the server is not aware of WSACleanup, but maybe it should because it needs to avoid calling any async operation completion. My questions are: 1) When I open 2 programs that use ws2_32 dll the global variables memory is not shared, right? Otherwise the WSAStartup/Cleanup count could be messed up if one application didn't call the Cleanup function. I hope this true so the socket list would not have to take care of different processes id. I understand that one application can have multiple threads and that's what the struct per_thread_data is about, but I hope the dll is not shared among different processes. 2) Is this a reasonable approach? If yes, is there any example of a critical protected list (add, iterate, remove items) that I could use? Best wishes, Bruno

1 0

Re: [PATCH 2/2] dmusic/tests: Add some COM tests for IDirectMusic/IDirectMusicCollection
by Marvin 28 Dec '13

28 Dec '13

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3877 Your paranoid android. === w2008s64 (32 bit dmusic) === dmusic.c:244: Test failed: DirectMusic8 create failed: 80040154, expected CLASS_E_NOAGGREGATION dmusic.c:251: Test failed: DirectMusic8 create failed: 80040154, expected E_NOINTERFACE dmusic.c:256: Test failed: DirectMusic8 create failed: 80040154, expected S_OK dmusic: unhandled exception c0000005 at 00401FDE === w2008s64 (64 bit dmusic) === dmusic.c:244: Test failed: DirectMusic8 create failed: 80040154, expected CLASS_E_NOAGGREGATION dmusic.c:251: Test failed: DirectMusic8 create failed: 80040154, expected E_NOINTERFACE dmusic.c:256: Test failed: DirectMusic8 create failed: 80040154, expected S_OK dmusic: unhandled exception c0000005 at 0000000000401EC2

1 0

Re: qedit/tests: Constify some character strings
by Marvin 28 Dec '13

28 Dec '13

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3869 Your paranoid android. === w2008s64 (32 bit mediadet) === mediadet.c:149: Test failed: CoCreateInstance failed: 80040154 mediadet: unhandled exception c0000005 at 0040185A === w2008s64 (64 bit mediadet) === mediadet.c:149: Test failed: CoCreateInstance failed: 80040154 mediadet: unhandled exception c0000005 at 00000000004017C3

1 0

Re: wtsapi32: partial implementation of WTSEnumerateProcessesW (resend)
by André Hentschel 28 Dec '13

28 Dec '13

> diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c > index 898b95d..53c6325 100644 > --- a/dlls/wtsapi32/wtsapi32.c > +++ b/dlls/wtsapi32/wtsapi32.c > @@ -18,9 +18,13 @@ > #include "config.h" > #include <stdarg.h> > #include <stdlib.h> > -#include "windef.h" > -#include "winbase.h" > +#include "ntstatus.h" > +#define WIN32_NO_STATUS > +#include "winternl.h" > #include "wtsapi32.h" > +#include "wine/library.h" > +#include "wine/server.h" > +#include "wine/unicode.h" > #include "wine/debug.h" do you need that all? > WINE_DEFAULT_DEBUG_CHANNEL(wtsapi); > @@ -84,14 +88,65 @@ BOOL WINAPI WTSEnumerateProcessesA(HANDLE hServer, DWORD Reserved, DWORD Version > BOOL WINAPI WTSEnumerateProcessesW(HANDLE hServer, DWORD Reserved, DWORD Version, > PWTS_PROCESS_INFOW* ppProcessInfo, DWORD* pCount) > { > - FIXME("Stub %p 0x%08x 0x%08x %p %p\n", hServer, Reserved, Version, > - ppProcessInfo, pCount); > + SYSTEM_PROCESS_INFORMATION *spi; > + ULONG size = 0x4000; > + void *buf = NULL; > + NTSTATUS status; > + DWORD i,lcount = 0; > + WTS_PROCESS_INFOW *linfo; can't you use sizeof(*spi) or a multiple of it for size? or clean it up somehow else... > if (!ppProcessInfo || !pCount) return FALSE; > > *pCount = 0; > *ppProcessInfo = NULL; > > + if (hServer != WTS_CURRENT_SERVER_HANDLE) > + { > + FIXME("Only WTS_CURRENT_SERVER_HANDLE is impemented\n"); > + return FALSE; > + } > + > + do { > + size *= 2; > + HeapFree(GetProcessHeap(), 0, buf); > + buf = HeapAlloc(GetProcessHeap(), 0, size); > + if (!buf) > + return FALSE; > + > + status = NtQuerySystemInformation(SystemProcessInformation, buf, size, NULL); > + } while(status == STATUS_INFO_LENGTH_MISMATCH); > + > + if (status != STATUS_SUCCESS) > + { > + HeapFree(GetProcessHeap(), 0, buf); > + SetLastError(RtlNtStatusToDosError(status)); > + return FALSE; > + } > + > + spi = buf; why not dropping buf completely? > + do { > + lcount++; > + spi = (SYSTEM_PROCESS_INFORMATION *)(((PCHAR)spi) + spi->NextEntryOffset); > + } while(spi->NextEntryOffset != 0); isn't there an easier way to get the count? > + linfo = HeapAlloc(GetProcessHeap(), 0, lcount * sizeof(WTS_PROCESS_INFOW)); > + if(!linfo) > + return FALSE; > + > + for(i = 0, spi = buf; i < lcount; i++) > + { > + linfo[i].SessionId = 0; > + linfo[i].ProcessId = HandleToUlong(spi->UniqueProcessId); > + linfo[i].pProcessName = spi->ProcessName.Buffer; > + linfo[i].pUserSid = NULL; > + spi = (SYSTEM_PROCESS_INFORMATION *)(((PCHAR)spi) + spi->NextEntryOffset); > + } > + *ppProcessInfo = linfo; > + *pCount = lcount; > + FIXME("pUserSid not filled\n"); > + > + HeapFree(GetProcessHeap(), 0, buf); > return TRUE; > } > > diff --git a/include/wtsapi32.h b/include/wtsapi32.h > index f4bab56..0476478 100644 > --- a/include/wtsapi32.h > +++ b/include/wtsapi32.h > @@ -135,6 +135,8 @@ typedef struct _WTS_SERVER_INFOW > DECL_WINELIB_TYPE_AW(WTS_SERVER_INFO) > DECL_WINELIB_TYPE_AW(PWTS_SERVER_INFO) > > +#define WTS_CURRENT_SERVER_HANDLE NULL > + maybe some more WTS_ defines while you're at it > void WINAPI WTSCloseServer(HANDLE); > BOOL WINAPI WTSConnectSessionA(ULONG, ULONG, PSTR, BOOL); > BOOL WINAPI WTSConnectSessionW(ULONG, ULONG, PWSTR, BOOL); >

2 1

Re: kernel32/tests: add test for RemoveDirectory
by Dmitry Timoshkov 28 Dec '13

28 Dec '13

Zhenbo Li <litimetal(a)gmail.com> wrote: > + /* remove a nonexist directory */ > + rc = RemoveDirectoryA(directory); > + todo_wine > + ok(!rc && GetLastError() == ERROR_FILE_NOT_FOUND, > + "Expected ERROR_FILE_NOT_FOUND, got ret=%d, gle=%d\n", rc, GetLastError() ); This kind of test for several values simultaneously is really very awkward as a starting point for any person who is going to work on this, or just is looking for a simple bug to fix and greps for todo_wine in the tests. First of all it's not clear where the failure is: is it the API failing to return correct return value, or is it just last error which is set differently? I admit that the error message mentions both values, but it's often more useful to spot areas with todo_wine statements and clearly see the reason of a failure without actually running the test. -- Dmitry.

3 3

Re: Bruno Jesus : ws2_32: Do not convert EAI_xxx return in case of success.
by Bruno Jesus 27 Dec '13

27 Dec '13

On Fri, Dec 27, 2013 at 5:31 PM, Alexandre Julliard <julliard(a)winehq.org> wrote: > Module: wine > Branch: master > Commit: fc5884c23296c0f121442d0832b0187074e95a10 > ... > @@ -5365,6 +5365,8 @@ static int convert_aiflag_u2w(int unixflags) { > static int convert_eai_u2w(int unixret) { > int i; > > + if (!unixret) return 0; > + > for (i=0;ws_eai_map[i][0];i++) > if (ws_eai_map[i][1] == unixret) > return ws_eai_map[i][0]; Hi, Alexandre. I just would like to say that my patch was based on the other use case of the convert_eai_u2w function, that is just call the function to convert EAI results. Zero is not an EAI result (there is no EAI_SUCCESS or something like that) so in my patch I just avoided calling the conversion function. I'm talking about this use case: http://source.winehq.org/source/dlls/ws2_32/socket.c#L5488 In summary, I think my original patch [1] could get a new reviewing. [1] - http://source.winehq.org/patches/data/101198 Best wishes, Bruno

1 0

Re: [4/4] ws2_32: Add extended IPX protocol support (try 2, resend)
by Marvin 27 Dec '13

27 Dec '13

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3867 Your paranoid android. === wxppro (32 bit sock) === sock.c:522: Test failed: oob_server (c8): unexpectedly at the OOB mark: 0 === w2008s64 (32 bit sock) === sock.c:522: Test failed: oob_server (750): unexpectedly at the OOB mark: 0 === w2008s64 (64 bit sock) === sock.c:522: Test failed: oob_server (654): unexpectedly at the OOB mark: 0 sock: unhandled exception c0000005 at 000007FEFE4C9D54

1 0

Re: [3/4] ws2_32: Add extended IPX protocol support (try 2)
by Marvin 27 Dec '13

27 Dec '13

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3866 Your paranoid android. === wxppro (32 bit sock) === sock.c:522: Test failed: oob_server (194): unexpectedly at the OOB mark: 0 === w2008s64 (32 bit sock) === sock.c:522: Test failed: oob_server (750): unexpectedly at the OOB mark: 0 === w2008s64 (64 bit sock) === sock.c:522: Test failed: oob_server (654): unexpectedly at the OOB mark: 0

1 0

Re: loader: bump XP 64-bit to service pack 2
by Qian Hong 27 Dec '13

27 Dec '13

Hi Austin, you forgot the patch? On Sat, Dec 28, 2013 at 4:04 AM, Austin English <austinenglish(a)gmail.com> wrote: > Fixes http://bugs.winehq.org/show_bug.cgi?id=35084 > > (follow up to 0463d01f151fb3d7c7acf26c7628683fefb6c130) > > > -- > -Austin > > -- Regards, Qian Hong - http://www.winehq.org

2 1

Re: [4/4] ws2_32/tests: Fix some test message typos
by Marvin 27 Dec '13

27 Dec '13

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3861 Your paranoid android. === wxppro (32 bit sock) === sock.c:522: Test failed: oob_server (5a8): unexpectedly at the OOB mark: 0 sock.c:2101: Test failed: Expected 10043, received 10047 sock: unhandled exception c0000005 at 71AB3F3A === wvista (32 bit sock) === sock.c:2101: Test failed: Expected 10043, received 10047 === w2008s64 (32 bit sock) === sock.c:522: Test failed: oob_server (750): unexpectedly at the OOB mark: 0 sock.c:2101: Test failed: Expected 10043, received 10047 === w7pro64 (32 bit sock) === sock.c:2101: Test failed: Expected 10043, received 10047 === w2008s64 (64 bit sock) === sock.c:522: Test failed: oob_server (654): unexpectedly at the OOB mark: 0 sock.c:2101: Test failed: Expected 10043, received 10047 sock: unhandled exception c0000005 at 000007FEFE4C9CD9 === w7pro64 (64 bit sock) === sock.c:2101: Test failed: Expected 10043, received 10047

1 0

Re: [3/4] ws2_32: Add extended IPX protocol support
by Marvin 27 Dec '13

27 Dec '13

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3860 Your paranoid android. === wxppro (32 bit sock) === sock.c:522: Test failed: oob_server (c0): unexpectedly at the OOB mark: 0 sock.c:2101: Test failed: Expected 10043, received 10047 sock: unhandled exception c0000005 at 71AB3F3A === wvista (32 bit sock) === sock.c:2101: Test failed: Expected 10043, received 10047 === w2008s64 (32 bit sock) === sock.c:522: Test failed: oob_server (768): unexpectedly at the OOB mark: 0 sock.c:2101: Test failed: Expected 10043, received 10047 === w7pro64 (32 bit sock) === sock.c:522: Test failed: oob_server (578): unexpectedly at the OOB mark: 0 sock.c:2101: Test failed: Expected 10043, received 10047 === w2008s64 (64 bit sock) === sock.c:522: Test failed: oob_server (7a4): unexpectedly at the OOB mark: 0 sock.c:2101: Test failed: Expected 10043, received 10047 === w7pro64 (64 bit sock) === sock.c:531: Test failed: oob_server (988): not at the OOB mark: 1 sock.c:2101: Test failed: Expected 10043, received 10047

1 0

Re: ws2_32/tests: Add some IPX socket tests
by Bruno Jesus 27 Dec '13

27 Dec '13

On Thu, Dec 26, 2013 at 8:11 PM, Bruno Jesus <00cpxxx(a)gmail.com> wrote: > > It looks like testbot does not support IPX but I manually tested this in XP SP3 and NT4 and the tests are OK. > > These are initial tests to find the problem for bug 6941. Please ignore this patch, I have a better one. Best regards, Bruno

1 0

Re: ws2_32/tests: Add some IPX socket tests
by Marvin 26 Dec '13

26 Dec '13

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3859 Your paranoid android. === wxppro (32 bit sock) === sock.c:521: Test failed: oob_server (c8): unexpectedly at the OOB mark: 0 === w2008s64 (32 bit sock) === sock.c:521: Test failed: oob_server (750): unexpectedly at the OOB mark: 0 === w2008s64 (64 bit sock) === sock.c:521: Test failed: oob_server (654): unexpectedly at the OOB mark: 0

1 0

Re: msxml3/tests: Constify some character strings
by Marvin 26 Dec '13

26 Dec '13

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3855 Your paranoid android. === wxppro (32 bit domdoc) === domdoc.c:9860: Test failed: got 00244F94

1 0

Implementing support for MFPlat.dll and MFReadWrite.dll
by Alexandre Bique 25 Dec '13

25 Dec '13

Hi, I'm trying to make Ableton Live works better with wine, and as stated in this bug: https://bugs.winehq.org/show_bug.cgi?id=35105 setting wine version to win8 will make Ableton Live crash. I first though that it was an issue with the OpenFileDialog being replaced by IFileDialog because it was something that changed and it was visible, but after second thought, I'm thinking about something else. I noticed that ableton tries to load these libraries: err:module:import_dll Library MFReadWrite.dll (which is needed by L"C:\\users\\Public\\Application Data\\Ableton\\Live 9 Suite\\Program\\VideoExportMMF.dll") not found err:module:import_dll Library MFPlat.DLL (which is needed by L"C:\\users\\Public\\Application Data\\Ableton\\Live 9 Suite\\Program\\VideoExportMMF.dll") not found and they're part of Microsoft Media Foundation ... And just after IFileDialog returns with valid data, the application crash and we can see on the output: fixme:commdlg:IServiceProvider_fnQueryService Interface {e07010ec-bc17-44c0-97b0-46c7c95b9edc} requested from unknown service {e07010ec-bc17-44c0-97b0-46c7c95b9edc} fixme:shell:ViewModeToListStyle ViewMode 0 not implemented fixme:shell:IShellBrowser_fnSendControlMsg stub, 0xea510 (2, 1026, a003, 0, 0x23d5b8) fixme:shell:IShellBrowser_fnSendControlMsg stub, 0xea510 (2, 1026, a004, 0, 0x23d5b8) fixme:shell:IShellBrowser_fnSendControlMsg stub, 0xea510 (2, 1025, a003, 1, 0x23d5b8) fixme:shell:IShellBrowser_fnSendControlMsg stub, 0xea510 (2, 1025, a004, 1, 0x23d5b8) fixme:nstc:NSTC2_fnSetControlStyle2 mask & style (0x00000004) contains unsupported style(s): 0x00000004 fixme:commdlg:IServiceProvider_fnQueryService Interface {e07010ec-bc17-44c0-97b0-46c7c95b9edc} requested from unknown service {e07010ec-bc17-44c0-97b0-46c7c95b9edc} fixme:shell:ViewModeToListStyle ViewMode 0 not implemented fixme:shell:IShellBrowser_fnSendControlMsg stub, 0xea510 (2, 1026, a003, 0, 0x23d248) fixme:shell:IShellBrowser_fnSendControlMsg stub, 0xea510 (2, 1026, a004, 0, 0x23d248) fixme:shell:IShellBrowser_fnSendControlMsg stub, 0xea510 (2, 1025, a003, 1, 0x23d248) fixme:shell:IShellBrowser_fnSendControlMsg stub, 0xea510 (2, 1025, a004, 1, 0x23d248) fixme:shell:IShellBrowser_fnOnViewWindowActive stub, 0xea510 (0x1574fa60) fixme:commdlg:IServiceProvider_fnQueryService Interface {e07010ec-bc17-44c0-97b0-46c7c95b9edc} requested from unknown service {e07010ec-bc17-44c0-97b0-46c7c95b9edc} fixme:shell:ViewModeToListStyle ViewMode 0 not implemented fixme:shell:IShellBrowser_fnSendControlMsg stub, 0xea510 (2, 1026, a003, 0, 0x23d3a8) fixme:shell:IShellBrowser_fnSendControlMsg stub, 0xea510 (2, 1026, a004, 0, 0x23d3a8) fixme:shell:IShellBrowser_fnSendControlMsg stub, 0xea510 (2, 1025, a003, 1, 0x23d3a8) fixme:shell:IShellBrowser_fnSendControlMsg stub, 0xea510 (2, 1025, a004, 1, 0x23d3a8) fixme:shell:IShellBrowser_fnOnViewWindowActive stub, 0xea510 (0xef860) fixme:commdlg:IServiceProvider_fnQueryService Interface {e07010ec-bc17-44c0-97b0-46c7c95b9edc} requested from unknown service {e07010ec-bc17-44c0-97b0-46c7c95b9edc} fixme:shell:ViewModeToListStyle ViewMode 0 not implemented fixme:shell:IShellBrowser_fnSendControlMsg stub, 0xea510 (2, 1026, a003, 0, 0x23d3a8) fixme:shell:IShellBrowser_fnSendControlMsg stub, 0xea510 (2, 1026, a004, 0, 0x23d3a8) fixme:shell:IShellBrowser_fnSendControlMsg stub, 0xea510 (2, 1025, a003, 1, 0x23d3a8) fixme:shell:IShellBrowser_fnSendControlMsg stub, 0xea510 (2, 1025, a004, 1, 0x23d3a8) fixme:shell:IShellBrowser_fnOnViewWindowActive stub, 0xea510 (0xeb240) fixme:dbghelp:elf_search_auxv can't find symbol in module So what do you think? Is MFPlat.dll and MFReadWrite.dll a good candidate? If so, how to implement the library? What are the guidelines? Thanks and happy Christmas, -- Alexandre Bique

2 1

Re: [PATCH] ddraw: add dsurface dimension tests, try 5
by Patrick Rudolph 25 Dec '13

25 Dec '13

How much physical memory does each test VM have ? more than 2 GByte ? On 64bit Windows I should be able to allocate 2GByte of virtual memory using the pagefile, shouldn't I ? Regards, Patrick Am 2013-12-14 13:10, schrieb 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 > https://newtestbot.winehq.org/JobDetails.pl?Key=3756 > > Your paranoid android. > > > === w2008s64 (64 bit ddraw4) === > ddraw4.c:5910: Test failed: Creating an offscreen plain surface with > width 0x2001 and height 0xffff returned 8007000e > > === w7pro64 (64 bit ddraw4) === > ddraw4.c:5910: Test failed: Creating an offscreen plain surface with > width 0x2001 and height 0xffff returned 8007000e > > === w2008s64 (64 bit ddraw2) === > ddraw2.c:5313: Test failed: Creating an offscreen plain surface with > width 0x2001 and height 0xffff returned 8007000e > > === w7pro64 (64 bit ddraw2) === > ddraw2.c:5313: Test failed: Creating an offscreen plain surface with > width 0x2001 and height 0xffff returned 8007000e > > === w2008s64 (64 bit ddraw1) === > ddraw1.c:4254: Test failed: Creating an offscreen plain surface with > width 0x2001 and height 0xffff returned 8007000e > > === w7pro64 (64 bit ddraw1) === > ddraw1.c:4254: Test failed: Creating an offscreen plain surface with > width 0x2001 and height 0xffff returned 8007000e > > === w2008s64 (64 bit ddraw7) === > ddraw7.c:5804: Test failed: Creating an offscreen plain surface with > width 0x2001 and height 0xffff returned 8007000e > > === w7pro64 (64 bit ddraw7) === > ddraw7.c:5804: Test failed: Creating an offscreen plain surface with > width 0x2001 and height 0xffff returned 8007000e

2 1

Re: infosoft/tests: Constify a character string
by Marvin 24 Dec '13

24 Dec '13

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 https://newtestbot.winehq.org/JobDetails.pl?Key=3827 Your paranoid android. === wvista (32 bit infosoft) === infosoft.c:183: Test failed: failed infosoft.c:197: Test failed: failed === w2008s64 (32 bit infosoft) === infosoft.c:183: Test failed: failed infosoft.c:197: Test failed: failed === w7pro64 (32 bit infosoft) === infosoft.c:183: Test failed: failed infosoft.c:197: Test failed: failed === w2008s64 (64 bit infosoft) === infosoft.c:183: Test failed: failed infosoft.c:197: Test failed: failed === w7pro64 (64 bit infosoft) === infosoft.c:183: Test failed: failed infosoft.c:197: Test failed: failed

1 0

COMDLG32: native color picker on mac os x
by Žiga Željko 23 Dec '13

23 Dec '13

Hello, I have made a patch for comdlg32 on Mac OS X that replaces Wine's own color picker dialog with the native one. Bellow are the sources for colordlg.c, cocoa_colordlg.m and Makefile.in (without comments). -------------------- colordlg.c -------------------- static BOOL ChooseColor_CocoaCommon(COLORREF *color, BOOL init); BOOL WINAPI ChooseColorW( CHOOSECOLORW *lpChCol ) { if (!lpChCol) return FALSE; return ChooseColor_CocoaCommon(&lpChCol->rgbResult, lpChCol->Flags & CC_RGBINIT); } BOOL WINAPI ChooseColorA( LPCHOOSECOLORA lpChCol ) { if (!lpChCol) return FALSE; return ChooseColor_CocoaCommon(&lpChCol->rgbResult, lpChCol->Flags & CC_RGBINIT); } struct RGBColor { unsigned short red; unsigned short green; unsigned short blue; }; int cocoa_run_color_dialog_modal(struct RGBColor *color); static BOOL ChooseColor_CocoaCommon(COLORREF *color, BOOL init) { struct RGBColor rgb = { 0, 0, 0 }; if (init) { rgb.red = GetRValue(*color) * 257; rgb.green = GetGValue(*color) * 257; rgb.blue = GetBValue(*color) * 257; } BOOL ret = cocoa_run_color_dialog_modal(&rgb); if (ret) *color = RGB(rgb.red / 257, rgb.green / 257, rgb.blue / 257); return ret; } -------------------- cocoa_colordlg.m -------------------- #import <AppKit/AppKit.h> #import <Carbon/Carbon.h> int cocoa_run_color_dialog_modal(RGBColor *color) { __block int ret = 0; void (^block)(void) = ^{ ret = GetColor((Point){ 0, 0 }, (const unsigned char *)"Color", color, color); }; if ([NSThread isMainThread]) block(); else dispatch_sync(dispatch_get_main_queue(), block); return ret; } -------------------- Makefile.in -------------------- MODULE = comdlg32.dll IMPORTLIB = comdlg32 IMPORTS = uuid shell32 shlwapi comctl32 winspool user32 gdi32 advapi32 DELAYIMPORTS = ole32 EXTRALIBS = -framework AppKit -framework Carbon C_SRCS = \ cdlg32.c \ colordlg.c \ filedlg.c \ filedlg31.c \ filedlgbrowser.c \ finddlg.c \ fontdlg.c \ itemdlg.c \ printdlg.c RC_SRCS = comdlg32.rc SVG_SRCS = \ pd32_collate.svg \ pd32_landscape.svg \ pd32_nocollate.svg \ pd32_portrait.svg OBJC_SRCS = \ cocoa_colordlg.m IDL_R_SRCS = comdlg32_classes.idl @MAKE_DLL_RULES@ ------------------------------------------------------------ Any comments are welcome.

2 1

D3D command stream abandoned?
by Forest 23 Dec '13

23 Dec '13

I haven't seen any news of the command stream lately. The last thing I read was the mention of "more preparation work" in the 1.7.4 release announcement. Has the project been abandoned? I maintain a wine build for gamers, and currently have it frozen at version 1.7.1 with Stefan's September 2 command stream patches, because they seem to boost performance quite a bit for some folks. I'd love to get something more mature into my users' hands if it's available.

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel