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

Re: [PATCH 07/12] ntdll/tests: add a test for STATUS_OBJECT_TYPE_MISMATCH
by Marvin 14 Jul '11

14 Jul '11

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

1 0

New API functions for loading external dlls
by Saulius Krasuckas 13 Jul '11

13 Jul '11

It seems MS announced three new functions yesterday: SetDefaultDllDirectories AddDllDirectory RemoveDllDirectory These are "to help developers correctly and securely load external libraries". [1] I remember some talk about SetDllDirectory() in the past [2], so now it's interesting how these two ways would coexist. Plus, could the new way help to simplify loading Gecko / XPCOM [3] by a chance? Probably not:) S. [1] http://support.microsoft.com/KB/2533623 [2] http://www.winehq.org/pipermail/wine-patches/2005-August/019625.html [3] http://source.winehq.org/source/dlls/mshtml/nsembed.c?v=wine-1.1.8#L144

1 0

Re: [PATCH 02/12] wscript: added helper function for tests
by Juan Lang 12 Jul '11

12 Jul '11

Hi Michal, please combine this with patch 3, it doesn't make sense on its own. --Juan

1 0

Re: d3dx9_36: Provide a replacement for signbit() if it is missing.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Francois Gouget <fgouget(a)codeweavers.com> writes: > @@ -292,6 +292,10 @@ ssize_t pwrite( int fd, const void *buf, size_t count, off_t offset ); > int readlink( const char *path, char *buf, size_t size ); > #endif /* HAVE_READLINK */ > > +#ifndef HAVE_SIGNBIT > +#define signbit(x) (copysign(1, (x)) < 0) > +#endif /* !defined(HAVE_SIGNBIT) */ This isn't quite correct for floats, and it's not much more portable. I'd suggest to fix the code instead. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: oleaut32: Add DISPID_PICT_RENDER support to OLEPictureImpl_Invoke
by Nikolay Sivov 12 Jul '11

12 Jul '11

On Tue, Jul 12, 2011 at 1:19 PM, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Hi, > > > Changelog: > oleaut32: Add DISPID_PICT_RENDER support to OLEPictureImpl_Invoke > + case DISPID_PICT_RENDER: + if (wFlags & DISPATCH_METHOD) + { + TRACE("DISPID_PICT_RENDER %d %d %d %d %d %d %d %d %d %d\n", + V_VT(&pDispParams->rgvarg[0]), V_VT(&pDispParams->rgvarg[1]), + V_VT(&pDispParams->rgvarg[2]), V_VT(&pDispParams->rgvarg[3]), + V_VT(&pDispParams->rgvarg[4]), V_VT(&pDispParams->rgvarg[5]), + V_VT(&pDispParams->rgvarg[6]), V_VT(&pDispParams->rgvarg[7]), + V_VT(&pDispParams->rgvarg[8]), V_VT(&pDispParams->rgvarg[9])); + + return IPicture_Render(&This->IPicture_iface, (HDC)V_I4(&pDispParams->rgvarg[9]), + V_I4(&pDispParams->rgvarg[8]), V_I4(&pDispParams->rgvarg[7]), + V_I4(&pDispParams->rgvarg[6]), V_I4(&pDispParams->rgvarg[5]), + V_I4(&pDispParams->rgvarg[4]), V_I4(&pDispParams->rgvarg[3]), + V_I4(&pDispParams->rgvarg[2]), V_I4(&pDispParams->rgvarg[1]), + (LPCRECT)&V_I4(&pDispParams->rgvarg[0])); + } + break; Correct me if I'm wrong, isn't it supposed to coerce arguments here? > > Best Regards > Alistair Leslie-Hughes > > > >

1 0

RE: oleaut32: Add DISPID_PICT_RENDER support to OLEPictureImpl_Invoke
by wylda＠volny.cz 12 Jul '11

12 Jul '11

Hi, isn't there a white space issue? (trailing) Regards, W.

1 0

Re: [PATCH 4/9 (try5)] winmm: Implement waveIn* on top of MMDevAPI
by Alexandre Julliard 12 Jul '11

12 Jul '11

Andrew Eikum <aeikum(a)codeweavers.com> writes: > --- > dlls/winmm/waveform.c | 622 > +++++++++++++++++++++++++++++++++++++++++++++---- > 1 files changed, 574 insertions(+), 48 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M dsound.dll -T ../../.. -p dsound_test.exe.so capture.c && touch capture.ok wine: Unhandled page fault on write access to 0x00000018 at address 0x68e9a0ab (thread 0009), starting debugger... Unhandled exception: page fault on write access to 0x00000018 in 32-bit code (0x68e9a0ab). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:68e9a0ab ESP:0032fc2c EBP:0032fc68 EFLAGS:00010246( R- -- I Z- -P- ) EAX:00000000 EBX:68ec468c ECX:00110064 EDX:00000000 ESI:0012c0f8 EDI:00128df0 Stack dump: 0x0032fc2c: 686a71ec 00128df0 00129c80 6869e7f0 0x0032fc3c: 686a71ec 00128df0 6869e7f0 0032fc68 0x0032fc4c: 00000000 00000001 6869ef24 0032fc78 0x0032fc5c: 686a71ec 00128df0 6869e7f0 0032fcc8 0x0032fc6c: 686864c1 00128df0 6869ef24 00000000 0x0032fc7c: 6869dbd5 00000002 00000000 00000000 Backtrace: =>0 0x68e9a0ab IDirectSoundCaptureImpl_Release+0xdb(iface=0x128df0) [/home/julliard/wine/wine/dlls/dsound/capture.c:1027] in dsound (0x0032fc68) 1 0x686864c1 IDirectSoundCapture_test+0x350(dsco=0x128df0, initialized=0, lpGuid=(nil)) [/home/julliard/wine/wine/dlls/dsound/tests/capture.c:175] in dsound_test (0x0032fcc8) 2 0x686881b1 func_capture+0x220() [/home/julliard/wine/wine/dlls/dsound/tests/capture.c:207] in dsound_test (0x0032fd38) 3 0x6869da3e run_test+0x14d(name="capture.c") [/home/julliard/wine/wine/dlls/dsound/tests/../../../include/wine/test.h:556] in dsound_test (0x0032fd88) 4 0x6869e507 main+0x156(argc=0xffffffff, argv=(nil)) [/home/julliard/wine/wine/dlls/dsound/tests/../../../include/wine/test.h:624] in dsound_test (0x0032fe48) 5 0x6869e6dc __wine_spec_exe_entry+0x7b(peb=0x7ffdf000) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in dsound_test (0x0032fe90) 6 0x7b85ac4c call_process_entry+0xb() in kernel32 (0x0032fea8) 7 0x7b85bc4f start_process+0x5e(peb=0x7ffdf000) [/home/julliard/wine/wine/dlls/kernel32/process.c:1087] in kernel32 (0x0032fee8) 8 0x7bc73908 call_thread_func+0xb() in ntdll (0x0032fef8) 9 0x7bc7706e call_thread_entry_point+0x6d(entry=0x7b85bbf0, arg=0x7ffdf000) [/home/julliard/wine/wine/dlls/ntdll/signal_i386.c:2499] in ntdll (0x0032ffc8) 10 0x7bc4c16e start_process+0x1d(kernel_start=0x7b85bbf0) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2612] in ntdll (0x0032ffe8) 11 0x6802996d wine_call_on_stack+0x1c() in libwine.so.1 (0x00000000) 0x68e9a0ab IDirectSoundCaptureImpl_Release+0xdb [/home/julliard/wine/wine/dlls/dsound/capture.c:1027] in dsound: movl $0x0,0x18(%eax) 1027 device->lock.DebugInfo->Spare[0] = 0; -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: dinput: BuildActionMap and SetActionMap stubs for generic joystick
by Michael Stefaniuc 12 Jul '11

12 Jul '11

Hello Lucas, for the future please stop adding the LPJUNK for COM interfaces, e.g. LPDIRECTINPUTDEVICE8W, use IDirectInputDevice8W* instead. In addition to the normal issues with the LPJUNK it hides the fact that this are interfaces making it hard to review that the COM rules aren't violated. It also complicates my COM cleanup script to the point that I've started to automatically replace PJUNK and LPJUNK with IJunk*. thanks bye michael Lucas Fialho Zawacki wrote: > --- > dlls/dinput/joystick.c | 60 +++++++++++++++++++++++++++++++++++++ > dlls/dinput/joystick_linux.c | 8 ++-- > dlls/dinput/joystick_linuxinput.c | 8 ++-- > dlls/dinput/joystick_osx.c | 8 ++-- > dlls/dinput/joystick_private.h | 6 ++++ > 5 files changed, 78 insertions(+), 12 deletions(-) > > diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c > index 1be6f31..68dcc6a 100644 > --- a/dlls/dinput/joystick.c > +++ b/dlls/dinput/joystick.c > @@ -426,6 +426,66 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, > return JoystickWGenericImpl_GetDeviceState(IDirectInputDevice8W_from_impl(This), len, ptr); > } > > + > +HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, > + LPDIACTIONFORMATW lpdiaf, > + LPCWSTR lpszUserName, > + DWORD dwFlags) > +{ > + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); > + > + return DI_NOEFFECT; > +} > + > +HRESULT WINAPI JoystickAGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface, > + LPDIACTIONFORMATA lpdiaf, > + LPCSTR lpszUserName, > + DWORD dwFlags) > +{ > + JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); > + DIACTIONFORMATW diafW; > + HRESULT hr; > + > + diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions); > + _copy_diactionformatAtoW(&diafW, lpdiaf); > + > + hr = JoystickWGenericImpl_BuildActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, NULL, dwFlags); > + > + _copy_diactionformatWtoA(lpdiaf, &diafW); > + HeapFree(GetProcessHeap(), 0, diafW.rgoAction); > + > + return hr; > +} > + > +HRESULT WINAPI JoystickWGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, > + LPDIACTIONFORMATW lpdiaf, > + LPCWSTR lpszUserName, > + DWORD dwFlags) > +{ > + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); > + > + return DI_NOEFFECT; > +} > + > +HRESULT WINAPI JoystickAGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface, > + LPDIACTIONFORMATA lpdiaf, > + LPCSTR lpszUserName, > + DWORD dwFlags) > +{ > + JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); > + DIACTIONFORMATW diafW; > + HRESULT hr; > + > + diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions); > + _copy_diactionformatAtoW(&diafW, lpdiaf); > + > + hr = JoystickWGenericImpl_SetActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, NULL, dwFlags); > + > + HeapFree(GetProcessHeap(), 0, diafW.rgoAction); > + > + return hr; > +} > + > /* > * This maps the read value (from the input event) to a value in the > * 'wanted' range. > diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c > index 5541522..3ad592d 100644 > --- a/dlls/dinput/joystick_linux.c > +++ b/dlls/dinput/joystick_linux.c > @@ -682,8 +682,8 @@ static const IDirectInputDevice8AVtbl JoystickAvt = > IDirectInputDevice2AImpl_SendDeviceData, > IDirectInputDevice7AImpl_EnumEffectsInFile, > IDirectInputDevice7AImpl_WriteEffectToFile, > - IDirectInputDevice8AImpl_BuildActionMap, > - IDirectInputDevice8AImpl_SetActionMap, > + JoystickAGenericImpl_BuildActionMap, > + JoystickAGenericImpl_SetActionMap, > IDirectInputDevice8AImpl_GetImageInfo > }; > > @@ -718,8 +718,8 @@ static const IDirectInputDevice8WVtbl JoystickWvt = > IDirectInputDevice2WImpl_SendDeviceData, > IDirectInputDevice7WImpl_EnumEffectsInFile, > IDirectInputDevice7WImpl_WriteEffectToFile, > - IDirectInputDevice8WImpl_BuildActionMap, > - IDirectInputDevice8WImpl_SetActionMap, > + JoystickWGenericImpl_BuildActionMap, > + JoystickWGenericImpl_SetActionMap, > IDirectInputDevice8WImpl_GetImageInfo > }; > > diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c > index c11edc7..afdee1e 100644 > --- a/dlls/dinput/joystick_linuxinput.c > +++ b/dlls/dinput/joystick_linuxinput.c > @@ -1417,8 +1417,8 @@ static const IDirectInputDevice8AVtbl JoystickAvt = > IDirectInputDevice2AImpl_SendDeviceData, > IDirectInputDevice7AImpl_EnumEffectsInFile, > IDirectInputDevice7AImpl_WriteEffectToFile, > - IDirectInputDevice8AImpl_BuildActionMap, > - IDirectInputDevice8AImpl_SetActionMap, > + JoystickAGenericImpl_BuildActionMap, > + JoystickAGenericImpl_SetActionMap, > IDirectInputDevice8AImpl_GetImageInfo > }; > > @@ -1453,8 +1453,8 @@ static const IDirectInputDevice8WVtbl JoystickWvt = > IDirectInputDevice2WImpl_SendDeviceData, > IDirectInputDevice7WImpl_EnumEffectsInFile, > IDirectInputDevice7WImpl_WriteEffectToFile, > - IDirectInputDevice8WImpl_BuildActionMap, > - IDirectInputDevice8WImpl_SetActionMap, > + JoystickWGenericImpl_BuildActionMap, > + JoystickWGenericImpl_SetActionMap, > IDirectInputDevice8WImpl_GetImageInfo > }; > > diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c > index 439c8ad..756a682 100644 > --- a/dlls/dinput/joystick_osx.c > +++ b/dlls/dinput/joystick_osx.c > @@ -972,8 +972,8 @@ static const IDirectInputDevice8AVtbl JoystickAvt = > IDirectInputDevice2AImpl_SendDeviceData, > IDirectInputDevice7AImpl_EnumEffectsInFile, > IDirectInputDevice7AImpl_WriteEffectToFile, > - IDirectInputDevice8AImpl_BuildActionMap, > - IDirectInputDevice8AImpl_SetActionMap, > + JoystickAGenericImpl_BuildActionMap, > + JoystickAGenericImpl_SetActionMap, > IDirectInputDevice8AImpl_GetImageInfo > }; > > @@ -1008,8 +1008,8 @@ static const IDirectInputDevice8WVtbl JoystickWvt = > IDirectInputDevice2WImpl_SendDeviceData, > IDirectInputDevice7WImpl_EnumEffectsInFile, > IDirectInputDevice7WImpl_WriteEffectToFile, > - IDirectInputDevice8WImpl_BuildActionMap, > - IDirectInputDevice8WImpl_SetActionMap, > + JoystickWGenericImpl_BuildActionMap, > + JoystickWGenericImpl_SetActionMap, > IDirectInputDevice8WImpl_GetImageInfo > }; > > diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h > index a332e24..71d91f1 100644 > --- a/dlls/dinput/joystick_private.h > +++ b/dlls/dinput/joystick_private.h > @@ -86,4 +86,10 @@ HRESULT WINAPI JoystickWGenericImpl_Poll(LPDIRECTINPUTDEVICE8W iface) DECLSPEC_H > HRESULT WINAPI JoystickAGenericImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, DWORD len, LPVOID ptr) DECLSPEC_HIDDEN; > HRESULT WINAPI JoystickWGenericImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, DWORD len, LPVOID ptr) DECLSPEC_HIDDEN; > > +HRESULT WINAPI JoystickAGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface, LPDIACTIONFORMATA lpdiaf, LPCSTR lpszUserName, DWORD dwFlags) DECLSPEC_HIDDEN; > +HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags) DECLSPEC_HIDDEN; > + > +HRESULT WINAPI JoystickAGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface, LPDIACTIONFORMATA lpdiaf, LPCSTR lpszUserName, DWORD dwFlags) DECLSPEC_HIDDEN; > +HRESULT WINAPI JoystickWGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags) DECLSPEC_HIDDEN; > + > #endif /* __WINE_DLLS_DINPUT_JOYSTICK_PRIVATE_H */

1 0

Re: [PATCH] libv4l: Fixed videodev.h header moving away from glibc to libv4l-devel
by Alexandre Julliard 12 Jul '11

12 Jul '11

Marcus Meissner <marcus(a)jet.franken.de> writes: > Hi, > > As seen in openSUSE 12.1 development, <linux/videodev.h> is no longer, ioctls > come from the libv4l compat library. We should probably switch to version 2 instead. -- Alexandre Julliard julliard(a)winehq.org

1 0

Raw Input Patch Update 16
by Vincas Miliūnas 12 Jul '11

12 Jul '11

This time submitting the full implementation to wine-devel and only the first patch to wine-patches. Changelog of the full implementation: * Rewritten test assertion messages to just state the reason of failure * Improved WM_INPUT posting, so it would be reflected using the GetQueueStatus function * Added proper GetRawInputBuffer implementation, that requires selecting and removing messages from the message queue, but that's how it works * Added releasing of allocated resources for raw input when destroying a process * Fixed DefRawInputProc to return -1 in case of an error instead of an error code. Also improved function's tests * Added tests and made RegisterRawInputDevices atomic, so there would be no changes if one of submitted registrations fails * Added tests to check for the correct GetQueueStatus(QS_RAWINPUT) status * Added tests to check for empty input queue before sending input using GetInputState * Tests of GetRegisteredRawInputDevices and RegisterRawInputDevices need to be paired and have both as a dependency, so split their tests into 4 parts to make smaller blocks of code * Moved raw input server request handlers to the bottom of the source file, like in the other files * Applied aligned formatting for groups of assignment statements * Other minor refactorings Zipped version - http://dl.dropbox.com/u/6901628/try16.zip Also I need to note the lack of applications that make extensive use of the raw input API. There are just a few games and they are convenient with just the mouse movement data.

2 1