- wine-devel - winehq.org

Re: [1/2] ole32: Add a storage test using a custom ILockBytes.
by Marvin 07 Jul '15

07 Jul '15

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://testbot.winehq.org/JobDetails.pl?Key=15093 Your paranoid android. === w7u (32 bit storage32) === Failure running script in VM: timed out waiting for the child process

1 0

Re: [PATCH 3/8] winex11.drv: implement DoDragDrop on top of XDND
by Ken Thomases 06 Jul '15

06 Jul '15

On Jul 4, 2015, at 8:36 AM, Damjan Jovanovic <damjan.jov(a)gmail.com> wrote: > > Implements DoDragDrop on top of XDND. While some of DoDragDrop() and > supporting functions are copied from ole32, they were modified to be > non-blocking and event-driven. > > The clipboard is patched to allow searching its clipboard formats for > X11 atoms, export data in X11 format, and forward selection requests > for the XdndSelection selection to XDND. > > We support XDND version 3 to 5 (although we still need XdndProxy > support for version 4). XdndPosition messages are rate-limited to at > most 1 unreplied message and at least every 50 milliseconds apart, so > that we don't flood slow X11 clients like the spec warns. In set_XdndTypeList() and X11DRV_XDND_SelectionRequest(), you use FIXMEs for most unsupported format properties, but just a TRACE for dwAspect != DVASPECT_CONTENT. Is there a reason for that? > + * When we ask for feedback from the drop source, sometimes it will > + * do all the necessary work and sometimes it will not handle it > + * when that's the case, we must display the standard drag and drop > + * cursors. Copy-pasted typo. There should be a period after "handle it" and we should capitalize "when that's the case". (Or change to "When it doesn't handle it" to be clearer.) > + /* > + * All the return valued will stop the operation except the S_OK > + * return value. > + */ Copy-pasted typo: "return valued" should be "return values". > + /* > + * When keyboard messages are sent to windows on this thread, we > + * want to ignore notify the drop source that the state changed. > + * in the case of the Escape key, we also notify the drop source > + * we give it a special meaning. > + */ Copy-pasted typo: "ignore notify". I'm not sure if the fix is to just drop "ignore" or to expand the sentence to explain that we swallow key events except to notify the drop source about the Escape key. -Ken

1 0

Re: [PATCH 2/8] ole32/user32/winemac.drv/winex11.drv: try using native drag and drop if possible
by Ken Thomases 06 Jul '15

06 Jul '15

Hi, > On Jul 4, 2015, at 8:36 AM, Damjan Jovanovic <damjan.jov(a)gmail.com> wrote: > > If possible, try using the drag and drop implemented by the native > windowing system instead of the one implemented by our ole32. This > patch just provides the framework, the next patch actually implements > all drag and drop over XDND. Thanks for doing this redesign. For this patch, is it necessary to add the driver entry point to the user drivers (winemac, winex11)? Since the null driver already returns E_NOTIMPL, it would seem the user drivers don't need to provide an entry point that just does the same thing. Is there a reason there's no loaderdrv_DoDragDrop()? Is it not possible for DoDragDrop() to be called before the driver has been loaded? -Ken

1 0

Re: [PATCH 1/2] shell32/tests: Win XP splits the args if there are spaces in the path.
by Marvin 06 Jul '15

06 Jul '15

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://testbot.winehq.org/JobDetails.pl?Key=15076 Your paranoid android. === w2000pro (32 bit shlexec) === shlexec.c:2447: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 shlexec.c:2447: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 shlexec.c:2447: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 shlexec.c:2447: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 shlexec.c:2447: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 shlexec.c:2447: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 === w8 (32 bit shlexec) === shlexec.c:139: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\test file.noassoc") WaitForSingleObject returned 258 shlexec.c:139: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\test file.noassoc") WaitForSingleObject returned 258 shlexec.c:1545: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\test file.noassoc") failed: rc=33 err=2 shlexec.c:1577: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\test file.noassoc', but key not found or empty shlexec.c:139: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\test file.shlexec.noassoc") WaitForSingleObject returned 258 shlexec.c:139: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\test file.shlexec.noassoc") WaitForSingleObject returned 258 shlexec.c:1545: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\test file.shlexec.noassoc") failed: rc=33 err=2 shlexec.c:1577: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\test file.shlexec.noassoc', but key not found or empty shlexec.c:139: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\test file.noassoc", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\wtD96A.tmp" Exec") WaitForSingleObject returned 258 shlexec.c:139: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\test file.noassoc", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\wtD96A.tmp" Exec") WaitForSingleObject returned 258 shlexec.c:2115: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\test file.noassoc", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\wtD96A.tmp" Exec") succeeded: rc=42

2 1

Re: [2/10]hidclass.sys: add hidclass.sys
by Henri Verbeet 06 Jul '15

06 Jul '15

I didn't really look at the rest of the series, but here are a few things that caught my eye. On 6 July 2015 at 17:46, Aric Stewart <aric(a)codeweavers.com> wrote: > +struct list minidriver_list = LIST_INIT(minidriver_list); You don't seem to access this outside of main.c anywhere in this series, and it seems somewhat unlikely that you'll ever have to. Shouldn't this just be static? > +static VOID WINAPI UnloadDriver(DRIVER_OBJECT *driver) "void" > + TRACE("Driver Unload\n"); > + LIST_FOR_EACH_ENTRY_SAFE(md, next, &minidriver_list, minidriver, entry) > + { > + if (md->minidriver.DriverObject == driver) > + { > + if (md->DriverUnload) > + md->DriverUnload(md->minidriver.DriverObject); > + list_remove(&md->entry); > + break; > + } > + } > +} Did you intend to use find_minidriver() here? > +minidriver* find_minidriver(DRIVER_OBJECT* driver) > +{ > + minidriver *md; > + LIST_FOR_EACH_ENTRY(md, &minidriver_list, minidriver, entry) > + { > + if (md->minidriver.DriverObject == driver) > + return md; > + } > + return NULL; > +} As the code currently is this isn't actually used until patch 10/10. You could potentially use it from UnloadDriver() as mentioned above, but it should still initially be static in that case. Your '*' placement is inconsistent. > +NTSTATUS WINAPI HidRegisterMinidriver(PHID_MINIDRIVER_REGISTRATION registration) "HID_MINIDRIVER_REGISTRATION *registration" > +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) > +{ > + switch(fdwReason) > + { > + case DLL_PROCESS_ATTACH: > + DisableThreadLibraryCalls(hInstDLL); > + break; > + } > + return TRUE; > +} As long as you don't do anything special in here, you don't need an explicit DllMain(). (But if you did, "void *" instead of LPVOID, and parameter naming.) > +/* These are from hidport.h but are only used here anyway */ > +typedef struct _HID_MINIDRIVER_REGISTRATION { The brace placement is inconsistent with the rest of the code. > + ULONG Revision; > + PDRIVER_OBJECT DriverObject; > + PUNICODE_STRING RegistryPath; "UNICODE_STRING *RegistryPath;" > + ULONG DeviceExtensionSize; > + BOOLEAN DevicesArePolled; > + UCHAR Reserved[3]; > +} HID_MINIDRIVER_REGISTRATION, *PHID_MINIDRIVER_REGISTRATION; If this is really only used inside hidclass.sys, you shouldn't need the PHID_MINIDRIVER_REGISTRATION typedef. > +NTSTATUS WINAPI HidRegisterMinidriver(PHID_MINIDRIVER_REGISTRATION MinidriverRegistration); The whitespace is odd here. Also, "HID_MINIDRIVER_REGISTRATION *registration". > +typedef struct _minidriver > +{ > + struct list entry; > + > + HID_MINIDRIVER_REGISTRATION minidriver; > + > + PDRIVER_UNLOAD DriverUnload; > +} minidriver; I suppose it's somewhat up to personal style, but you don't need a typedef for this. Aside from saving you from typing "struct" a few times it only obfuscates the code. I suspect some of the imports and includes aren't actually used until later in the series, but I didn't explicitly check that.

1 0

Re: [PATCH 2/2] shell32/tests: Win 2k doesn't cope with spaces in the path.
by Marvin 06 Jul '15

06 Jul '15

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://testbot.winehq.org/JobDetails.pl?Key=15077 Your paranoid android. === w8 (32 bit shlexec) === shlexec.c:139: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\test file.noassoc") WaitForSingleObject returned 258 shlexec.c:139: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\test file.noassoc") WaitForSingleObject returned 258 shlexec.c:1545: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\test file.noassoc") failed: rc=33 err=2 shlexec.c:1577: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\test file.noassoc', but key not found or empty shlexec.c:139: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\test file.shlexec.noassoc") WaitForSingleObject returned 258 shlexec.c:139: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\test file.shlexec.noassoc") WaitForSingleObject returned 258 shlexec.c:1545: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\test file.shlexec.noassoc") failed: rc=33 err=2 shlexec.c:1577: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\test file.shlexec.noassoc', but key not found or empty shlexec.c:139: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\test file.noassoc", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\wtDFB4.tmp" Exec") WaitForSingleObject returned 258 shlexec.c:139: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\test file.noassoc", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\wtDFB4.tmp" Exec") WaitForSingleObject returned 258 shlexec.c:2115: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\test file.noassoc", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\wtDFB4.tmp" Exec") succeeded: rc=42

1 0

Wine Gecko 2.40-beta1
by Jacek Caban 06 Jul '15

06 Jul '15

Hi all, It's time for another Wine Gecko update. I uploaded new builds to SourceForge. The new version is updated to use upcoming Firefox 40 engine and brings a few Wine-specific fixes. It also adds support for building with MSVC, contributed by Austin. If you want to test it, just build Wine with the attached patch. Wine will download Gecko for you. All feedback is appreciated. Thanks, Jacek

1 0

Re: [PATCH 2/3]: msvcp110: Add tr2_sys__Rename implementation and test.(try 3)
by Piotr Caban 06 Jul '15

06 Jul '15

On 07/05/15 20:49, YongHao Hu wrote: > + if(!strcmp(old_path, new_path) || MoveFileExA(old_path, new_path, MOVEFILE_COPY_ALLOWED)) The comparison of paths doesn't look right. Why have you added it? Cheers, Piotr

2 1

Adding RID_TYPEHID RawInput support to user32
by Nathan Schulte 06 Jul '15

06 Jul '15

(Apologies if double posting; I wasn't sub'd the first time and it wasn't in the archives.) I'm working to extend Wine's RawInput implementation to support gamepads/controllers (and possibly joysticks, or any non-keyboard/mouse HID device). I found this on the wine-patches list: Vincas Miliūnas wrote: > A comment about going beyond mouse/keyboard for raw input:Other > devices then mouse&keyboard produce undocumented blobs of bytes;to > interpret them, functions from the hid.dll are used. Currently > theyare unimplemented stubs in WINE as well as not the problem I am > solving.There is a recent article about this subject - Using the Raw > Input APIto Process Joystick Input > -http://www.codeproject.com/KB/game/RawInputJoystick.aspx Does this imply then, that if one was to add support for "raw" rawinput (RIM_TYPEHID device type) it could be used in conjunction with a native hid.dll and software that required RIM_TYPEHID input (for e.g. game controllers in games) would start working? Nathan Schulte (me; original post) wrote: > Also, could one create an adaptation from some joystick input libraries > (evdev/x11,rawhid) and make it conform to the API in the CodeProject > example, making modifications similar to Henri Verbeet's for mouse and > keyboard and have built-in support for this? > > (Henri Verbeet's rawinput contributions: > http://source.winehq.org/git/wine.git/?a=search&st=commit&s=rawinput) > > I see that Wine already has support for joysticks in some other > fashion (the gamepad I'm working with shows up in the `wine control` > Game Controller testing interface), and I bet it's a good idea to > leverage that adaptation (those adaptations...) than to start adding > my own. > > Any direction here would be appreciated. I think I understand the > separation between the wineserver (mainly server/queue.c) and the > dlls (dlls/user32/*), but I see that there are other "dlls" that > don't use (or don't appear to use, given my probably incorrect > understanding) wineserver for their adaptation, and instead talk > directly with the Linux libs to do their work (I'm assuming). It looks like what I was was seeing was "Wine drivers," (winejoystick.drv, for winmm's joystick bits, and DirectInput's joystick bits). Should I follow that route, or should I plumb this through wineserver, like the rawinput keyboard and mouse? Why are those plumbed through wineserver? Are they shared resources, and if so, why doesn't that matter for winmm and DirectInput? I'm thinking this should be fairly easy to get working, by enumerating the rawhid devices and just piping the data through. I'm not sure how well the native hid.dll will work though; can anyone comment? Any help is welcome, as it means my patches are more likely to make it upstream and benefit others. I'm wondering if there's an architecture diagram/doc somewhere to help me understand how the system works. Thanks, -- Nate

3 3

crossover programs missing from source code
by Theodore Dubois 05 Jul '15

05 Jul '15

The following programs in Crossover are absent from the source code download: assocscan autorun ctfmon cxcplinfo cxdummy cxinstallfonts cxmanip cxmklnk cxnative cxwget ddhelp extract findfast icwconn1 imjpmig maildoff mdm mosearch netscape ntoskrnl pstores qttask reboot sendwndcmd winewrapper Can I get an explanation for each of these? ~Theodore

4 3

Re: XInput [1/4]: Implement XInputGetState
by Stefan Dösinger 05 Jul '15

05 Jul '15

Am 09.07.2009 um 02:58 schrieb Michael Gruber: > This patch series implements parts of the XInput library. You can use > this to play games that support Xbox 360 Controllers. To be able to > use this you will need to have your Controller working on Linux via > the xpad kernel driver and the event interface. It will not work on > any OS other than Linux. It supports gamepads, should work with > guitars and wheels, but will not work with dance-mats. > <1-XInputGetState.patch> Is it possible to implement XInput on top of DirectInput? DirectInput already has some internal abstraction layers for differnet joystick APIs, and has basic support for OSX joysticks. Does DInput have enough capabilities to access all the Xbox controller's features? My gut says no, otherwise MS wouldn't have created a new lib. I guess its worth checking though.

5 6

Re: [4/7] ntdll/tests: Add basic tests for threadpool wait objects.
by Marvin 05 Jul '15

05 Jul '15

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://testbot.winehq.org/JobDetails.pl?Key=15039 Your paranoid android. === w7u (32 bit threadpool) === threadpool.c:734: Test failed: WaitForSingleObject returned 258

2 1

Re: ole32: Accept STG_E_UNIMPLEMENTEDFUNCTION when ILockBytes implementation doesn't support locking.
by Nikolay Sivov 04 Jul '15

04 Jul '15

On 03.07.2015 10:27, Dmitry Timoshkov wrote: > Some custom implementations return it instead of STG_E_INVALIDFUNCTION. > --- > dlls/ole32/storage32.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c > index 220e17e..aa53758 100644 > --- a/dlls/ole32/storage32.c > +++ b/dlls/ole32/storage32.c > @@ -5015,7 +5015,7 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) > hr = StorageImpl_LockRegionSync(This, offset, cb, LOCK_ONLYONCE); > > /* If the ILockBytes doesn't support locking that's ok. */ > - if (hr == STG_E_INVALIDFUNCTION) return S_OK; > + if (hr == STG_E_INVALIDFUNCTION || hr == STG_E_UNIMPLEMENTEDFUNCTION) return S_OK; > else if (FAILED(hr)) return hr; > > hr = S_OK; > It looks like StorageImpl_LockRegionSync should be fixed instead to filter some error codes. Could you add a test with external ILockBytes implementation that does that?

3 7

Re: [PATCH 5/6]: msvcp110: Add tr2_sys__Lstat implementation and test.(resend)
by Piotr Caban 04 Jul '15

04 Jul '15

On 07/03/15 06:00, YongHaoHu wrote: > +/* ?_Lstat@sys@tr2@std@@YA?AW4file_type@123@PBDAAH@Z */ > +/* ?_Lstat@sys@tr2@std@@YA?AW4file_type@123@PEBDAEAH@Z */ > +file_type tr2_sys__Lstat(char const* path, int *err_code) > +{ > + DWORD attr; > + TRACE("(%s %p)\n", debugstr_a(path), err_code); > + if(!path) { > + *err_code = ERROR_INVALID_PARAMETER; > + return status_unknown; > + } > + > + attr = GetFileAttributesA(path); > + if(attr == INVALID_FILE_ATTRIBUTES) > + return stat_set_error(err_code); > + if(attr & FILE_ATTRIBUTE_REPARSE_POINT) > + FIXME("reparse point is not supported yet\n"); > + > + *err_code = ERROR_SUCCESS; > + return (attr & FILE_ATTRIBUTE_DIRECTORY)?directory_file:regular_file; > +} What's the reason for not calling tr2_sys__Stat function here? Thanks, Piotr

2 3

Adding RID_TYPEHID RawInput support to user32
by Nathan Schulte 03 Jul '15

03 Jul '15

I'm working to extend Wine's RawInput implementation to support gamepads/controllers (and possibly joysticks, or any non-keyboard/mouse HID device). I found this on the wine-patches list: Vincas Miliūnas wrote: > A comment about going beyond mouse/keyboard for raw input:> Other devices then mouse&keyboard produce undocumented blobs of bytes;> to interpret them, functions from the hid.dll are used. Currently they> are unimplemented stubs in WINE as well as not the problem I am solving.> There is a recent article about this subject - Using the Raw Input API> to Process Joystick Input -> http://www.codeproject.com/KB/game/RawInputJoystick.aspx Does this imply then, that if one was to add support for "raw" rawinput (RIM_TYPEHID device type) it could be used in conjunction with a native hid.dll and software that required RIM_TYPEHID input (for e.g. game controllers in games) would start working? Also, could one create an adaptation from some joystick input libraries (evdev/x11) and make it conform to the API in the CodeProject example, making modifications similar to Henri Verbeet's and have built-in support for this? (Henri Verbeet's rawinput contributions: http://source.winehq.org/git/wine.git/?a=search&st=commit&s=rawinput) I see that Wine already has support for joysticks in some other fashion (the gamepad I'm working with shows up in the `wine control` Game Controller testing interface), and I bet it's a good idea to leverage that adaptation (those adaptations...) than to start adding my own. Any direction here would be appreciated. I think I understand the separation between the wineserver (mainly server/queue.c) and the dlls (dlls/user32/*), but I see that there are other "dlls" that don't use (or don't appear to use, given my probably incorrect understanding) wineserver for their adaptation, and instead talk directly with the Linux libs to do their work (I'm assuming). Any help is welcome, as it means my patches are more likely to make it upstream and benefit others. I'm wondering if there's an architecture diagram/doc somewhere to help me understand how the system works. Thanks, -- Nate

1 0

Re: [PATCH 1/2] d3drm: Add stubs for IDirect3DRMDevice methods.
by Stefan Dösinger 03 Jul '15

03 Jul '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-07-01 um 01:03 schrieb Aaryaman Vasishta: > +static ULONG WINAPI d3drm_device1_AddRef(IDirect3DRMDevice *iface) > +{ > + struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); > + ULONG refcount = InterlockedIncrement(&device->ref); > + > + TRACE("%p increasing refcount to %u.\n", iface, refcount); > + > + return refcount; > +} > + > +static ULONG WINAPI d3drm_device1_Release(IDirect3DRMDevice *iface) > +{ > + struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); > + > + return IDirect3DRMDevice2_Release(&device->IDirect3DRMDevice2_iface); > +} Why are you forwarding Release to d3drmdevice2 but not Addref? I think we should look again at moving the IUnknown methods to Device3, so we don't thunk to the middle child and stay consistent with the other methods. Please send an extra patch before this one that migrates the code to device3. I remember we already looked at this. If this failed in some spectacular way please remind me :-) . Is there a logic behind which method forwards to device3 and which just returns E_NOTIMPL? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVk+jzAAoJEN0/YqbEcdMwL/MP/jmYjvhWcVOosMP2FyKVaezA c4SqCONBE+xPvhmC97IfPXZ8wJQUjH0tt5CjZN2JZTY0yw50bEM4JHDfC1pPjF3O IX4qKllp0UeAeNCNKu64a8rxYT2kLRwLp7zs+GO7YygwimKy9DAMxUCW5+IP4DiB bsO1wTcSWlCHQ8c4ikUou6aIY/npJ+UqVS8DNGl5m1cLw6oUdzZMvcurSooH2LUv 1oq4XC1DQe/wx3Ob826xY8w/2v6CM0JDAgAT1dGqxIWDS5DNzsKj9P8oKEso/C8c thpZdsIvgQLEkfmKgN6wRh9h03aAMVHbXoSmGVihaapSspF7299DYrDyoiQvYxEq k+SgAMqHAtAzfXkQto9n0f8FjiLEJzbFu9WMoKLJmjdk7hpH8CXPsoioA/o8xNDA 8dB9LxITlJuK5oEUczGhdrnN144Ml8AkZbs+DBcvTdHvaOaY7urL2sZ6/QuvGtAY IGGeUnPW2VBMGpg1YlSn9OmziBibrjKOVtXHVmbwYQhZhXOcfzgMT+QBBV2eQ/pQ 0tmDnUk93+ungNnc4slfLZo+uZ8/8kvPRMv8fYPcQjkcXOIRCobup4bqx3vrQVWT zOx05HKBDQihZAxZuHynFaNqA5E1QbhbPac0BsOSLk8r4zSKx58BgNLBYWz51oe6 NN959TJY84womG8/lfFc =jkwG -----END PGP SIGNATURE-----

2 1

Re: [2/2] shell32/tests: Destroy shell view windows.
by Nikolay Sivov 03 Jul '15

03 Jul '15

On 02.07.2015 13:36, Thomas Faber wrote: > When calling IShellView::CreateViewWindow, the window itself takes > references to the shell view and related objects (e.g. for a drop > target). This means just calling IShellView::Release is not enough to > properly clean up, the window needs to be destroyed as well. > Could you please also add a test that shows window is still being alive after IShellView was released? It could be a separate patch.

2 1

Re: [PATCH 4/6]: msvcp110: Add tr2_sys__Stat implementation and test.(try 2)
by Piotr Caban 03 Jul '15

03 Jul '15

On 07/03/15 05:59, YongHaoHu wrote: > +static file_type stat_set_error(int *err_code) > +{ > + file_type ret; > + > + switch(GetLastError()) { > + case ERROR_FILE_NOT_FOUND: > + case ERROR_BAD_NETPATH: > + case ERROR_INVALID_NAME: > + case ERROR_BAD_PATHNAME: > + case ERROR_PATH_NOT_FOUND: > + ret = file_not_found; > + *err_code = ERROR_SUCCESS; > + break; > + case ERROR_SUCCESS: > + ret = regular_file; > + *err_code = ERROR_SUCCESS; > + break; Why are you handling ERROR_SUCCESS here? stat_set_error function is only called in case of error. Are you planning to reuse this function somewhere else? If not it might be part of tr2_sys__Stat function. Thanks, Piotr

1 0

Re: [PATCH 2/6]: msvcp110: Add tr2_sys__Rename implementation and test. (try 2)
by Piotr Caban 03 Jul '15

03 Jul '15

On 07/03/15 05:56, YongHaoHu wrote: > + if(MoveFileExA(old_path, new_path, MOVEFILE_REPLACE_EXISTING|MOVEFILE_COPY_ALLOWED)) According to my testing MOVEFILE_REPLACE_EXISTING flag should not be used here. Thanks, Piotr

1 0

Re: [PATCH 1/6]: msvcp110: Add tr2_sys__Copy_file implementation and test.(try 2)
by YongHaoHu 03 Jul '15

03 Jul '15

Hi, all. Found a mistake of tr2_sys__Copy_file, please ignore this patch. Thank you. On 15/7/3 上午11:55, YongHaoHu wrote: > try2 : > Add is_todo in test. > Delete useless SetLastError. > > --- > dlls/msvcp110/msvcp110.spec | 4 +-- > dlls/msvcp120/msvcp120.spec | 4 +-- > dlls/msvcp120/tests/msvcp120.c | 59 > +++++++++++++++++++++++++++++++++++++ > dlls/msvcp120_app/msvcp120_app.spec | 4 +-- > dlls/msvcp90/ios.c | 10 +++++++ > 5 files changed, 75 insertions(+), 6 deletions(-) > >

1 0

Re: [6/12] ntdll/tests: Add tests for threadpool timer merging.
by Sebastian Lackner 03 Jul '15

03 Jul '15

On 03.07.2015 01:59, Sebastian Lackner wrote: > --- > dlls/ntdll/tests/threadpool.c | 117 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 117 insertions(+) > The test failure on Windows 7 seems to be random, it worked fine on a second run (and also on several test runs before): https://newtestbot.winehq.org/JobDetails.pl?Key=14968 If it occurs too often in practice we can increase the timeouts, but for now I think it should be fine. BTW: Forgot to mention, the Sleeps() in this patch are necessary because there is no way to do any other kind of synchronization with the Windows internal timer queue thread.

1 0

Re: [6/12] ntdll/tests: Add tests for threadpool timer merging.
by Marvin 03 Jul '15

03 Jul '15

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://testbot.winehq.org/JobDetails.pl?Key=14965 Your paranoid android. === w7u (32 bit threadpool) === threadpool.c:856: Test failed: WaitForSingleObject returned 258 threadpool.c:897: Test failed: expected that ticks are nonzero threadpool.c:899: Test failed: expected that timers are merged

1 0

Re: [PATCH 2/4] wined3d: Implement vertex blending in glsl_vertex_pipe.
by Stefan Dösinger 02 Jul '15

02 Jul '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I like this patchset. I can't find anything wrong in it, but Matteo knows the fixed function pipeline replacement better than I do, so I'll wait for his comments. I tested it with various DirectX SDK samples (bend from dx7, SkinnedMesh and VertexBlend from dx8). It works very well, but I noticed a lighting oddity in SkinnedMesh. The lighting differs slightly between your code ("D3D non-indexed" option) and the test program's vertex shader or d3dx9's software vertex blending ("D3D indexed (VS)" / "Software Skinning"). This difference cannot be seen on Windows. I have attached screenshots. Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVlPPNAAoJEN0/YqbEcdMwUcIP/jwJsie6/93Ui3RQTqjT8oOP q0ips3E83dHpi0ceL8xXujr0pyO1x7cVuUX+hZ7Tf08bZu86FpieKZkTYZxRKbKj V5+x/bVlWGM+ogB06E7tHx2oM8tBFlh10wwh9M/QnitjtzCM+E3WKfE01W5NsRRL csUMxE1mBHvnp08Me2CZyzgtVWwQuTWH6IMUtmqQPfOmmOgzIoofjjRowjhZovFi D9cufKD/D+CBsuv/Py5AMYWfjv7gTZqB09sotaIzYWuyI/e6GRRFT2wzX1yOIl+I fhOr3AsHeFLWOAYd41DjMuqmqvQ5e/UigYxkDtssOCHVig7VtaQ0RKTEv6mMfDF4 6Ljgyi7RdGrgle41cDo6DBXTr0WZw6Y2eTLs0G+WCNkJ8/OMR9hLAt/YBg1mPEPo QUNTsqwNQ1Poxuxmo5fWqD0MhLAao7Wgm6dZTiECNPNNBsC91XRYR9jXF29xaB3h 3ekVCTdtI1+wUQolGw1/HZ7whaHkWGrxOY4qqiZsgYRYz1yl52Bt4sJDJYUHknbd GZ4JRkVQXD86D5txRLf500e03QCmDTXxjqEKSsNBNCtcpER1mp+3Hs/SImp/adRr 3tNuEMJduA/5jm27Nt+K13DwsazQXCJMDv5dTYlggBI9c3dhFDmjXNNGSvrvkBkf xW9FbSiHRRDoLR3UMuoR =Ghq/ -----END PGP SIGNATURE-----

2 1

Re: [3/3] msvcirt: Implement ios constructors and assignment
by Marvin 02 Jul '15

02 Jul '15

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://testbot.winehq.org/JobDetails.pl?Key=14949 Your paranoid android. === wvistau64 (64 bit msvcirt) === No test summary line found === w2008s64 (64 bit msvcirt) === No test summary line found

1 0

Re: [2/3] msvcirt/tests: Add initial tests for ios
by Marvin 02 Jul '15

02 Jul '15

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://testbot.winehq.org/JobDetails.pl?Key=14948 Your paranoid android. === wvistau64 (64 bit msvcirt) === No test summary line found === w2008s64 (64 bit msvcirt) === No test summary line found

1 0

A wrapper around the GTK+ rendering engine
by Ivan Akulinchev 02 Jul '15

02 Jul '15

Hello, I just want to thank you for Wine and show you my own uxtheme.dll implementation, which uses the GTK+ rendering engine. Thus Wine applications look really native for users. Here is the link: https://github.com/akulinchev/uxthemegtk (see the screenshots at the bottom of the page) If you want, I can help you to add it to the Wine code. If not, I will develop it alone as a third-party project, but then I have a question: what is the best way to replace a Wine library? I think, I shouldn't change anything in /usr/lib/wine. I know about "native libs", but it's an ELF binary, not PE. Regards, Ivan

5 8

Re: [PATCH 4/4] d3d9/tests: Add basic tests for vertex blending.
by Henri Verbeet 02 Jul '15

02 Jul '15

On 2 July 2015 at 08:26, Józef Kucia <joseph.kucia(a)gmail.com> wrote: > + static const float quad_upper_right[] = > + { > + -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, > + -1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, > + 1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, > + 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, > + }, I think it's slightly more readable to specify these as e.g. static const struct { struct vec3 position; struct vec3 blendweights; } quad_upper_right[] = { ... }, instead of an otherwise unstructured collection of floats. You can also potentially fold these into the tests[] array. > + static const struct { > + const float *vertex_data; > + const POINT *quad_points; > + const POINT *empty_points; > + } > + tests[] = Position of the upper brace.

1 0

Re: [PATCH 2/4] wined3d: Implement vertex blending in glsl_vertex_pipe.
by Henri Verbeet 02 Jul '15

02 Jul '15

On 2 July 2015 at 08:26, Józef Kucia <joseph.kucia(a)gmail.com> wrote: > @@ -3071,7 +3075,7 @@ static inline BOOL shader_constant_is_local(const struct wined3d_shader *shader, > > void get_identity_matrix(struct wined3d_matrix *mat) DECLSPEC_HIDDEN; > void get_modelview_matrix(const struct wined3d_context *context, const struct wined3d_state *state, > - struct wined3d_matrix *mat) DECLSPEC_HIDDEN; > + int i, struct wined3d_matrix *mat) DECLSPEC_HIDDEN; I think we'll want the index to be unsigned. (Also applies to shader_glsl_ffp_vertex_normalmatrix_uniform() in patch 112562) Looks pretty good otherwise.

1 0

Re: [PATCH 1/2] comctl32: Set the default separator width when notifying a -ve cmd id.
by Marvin 02 Jul '15

02 Jul '15

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://testbot.winehq.org/JobDetails.pl?Key=14914 Your paranoid android. === wvistau64 (64 bit toolbar) === toolbar.c:519: Test failed: Images count mismatch - 26 vs 10 toolbar.c:519: Test failed: Icon size mismatch - 8x8 vs 20x20 toolbar.c:523: Test failed: Images count mismatch - 28 vs 22 toolbar.c:523: Test failed: Icon size mismatch - 16x16 vs 20x20 toolbar.c:533: Test failed: Icon size mismatch - 8x8 vs 16x16 toolbar.c:536: Test failed: Icon size mismatch - 30x30 vs 16x16 toolbar.c:544: Test failed: Images count mismatch - 8 vs 13 toolbar.c:544: Test failed: Icon size mismatch - 30x30 vs 16x16 toolbar.c:548: Test failed: Images count mismatch - 208 vs 13 toolbar.c:548: Test failed: Icon size mismatch - 1x1 vs 16x16 toolbar.c:551: Test failed: Images count mismatch - 208 vs 13 toolbar.c:551: Test failed: Icon size mismatch - 1x5 vs 16x16 toolbar.c:554: Test failed: Images count mismatch - 41 vs 13 toolbar.c:554: Test failed: Icon size mismatch - 5x1 vs 16x16 toolbar.c:1331: Test failed: Icon size mismatch - 14x12 vs 16x15

2 1

Re: [PATCH 2/2] comctl32: Implement the legacy notifications during restore.
by Marvin 01 Jul '15

01 Jul '15

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://testbot.winehq.org/JobDetails.pl?Key=14915 Your paranoid android. === wvistau64 (64 bit toolbar) === toolbar.c:584: Test failed: Images count mismatch - 26 vs 10 toolbar.c:584: Test failed: Icon size mismatch - 8x8 vs 20x20 toolbar.c:588: Test failed: Images count mismatch - 28 vs 22 toolbar.c:588: Test failed: Icon size mismatch - 16x16 vs 20x20 toolbar.c:598: Test failed: Icon size mismatch - 8x8 vs 16x16 toolbar.c:601: Test failed: Icon size mismatch - 30x30 vs 16x16 toolbar.c:609: Test failed: Images count mismatch - 8 vs 13 toolbar.c:609: Test failed: Icon size mismatch - 30x30 vs 16x16 toolbar.c:613: Test failed: Images count mismatch - 208 vs 13 toolbar.c:613: Test failed: Icon size mismatch - 1x1 vs 16x16 toolbar.c:616: Test failed: Images count mismatch - 208 vs 13 toolbar.c:616: Test failed: Icon size mismatch - 1x5 vs 16x16 toolbar.c:619: Test failed: Images count mismatch - 41 vs 13 toolbar.c:619: Test failed: Icon size mismatch - 5x1 vs 16x16 toolbar.c:1396: Test failed: Icon size mismatch - 14x12 vs 16x15

1 0

Re: ieframe: implement clicking on Properties
by Jacek Caban 01 Jul '15

01 Jul '15

Hi Jared, On 06/30/15 16:00, Jared Smudde wrote: > When the user clicks on the properties menu in ieframe, launch inetcpl.cpl. > > dlls/ieframe/iexplore.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c > index 08bb167..c1d0d74 100644 > --- a/dlls/ieframe/iexplore.c > +++ b/dlls/ieframe/iexplore.c > @@ -402,6 +402,11 @@ static void ie_dialog_about(HWND hwnd) > DestroyIcon(icon); > } > > +static void ie_dialog_properties(HWND hwnd) > +{ > + ShellExecuteW(hwnd, NULL, L"inetcpl.cpl", NULL, NULL, 0); > +} I think that we should call inetcpl.cpl functions directly here (probably LaunchInternetControlPanel). Also, you can't use L"" for strings due to compatibility problems, see how other strings are declared. > + > static void add_tb_separator(HWND hwnd) > { > TBBUTTON btn; > @@ -629,6 +634,10 @@ static LRESULT iewnd_OnCommand(InternetExplorer *This, HWND hwnd, UINT msg, WPAR > case ID_BROWSE_QUIT: > ShowWindow(hwnd, SW_HIDE); > break; > + > + case ID_BROWSE_PROPERTIES: > + ie_dialog_properties(hwnd); > + break; Broken indention. Thanks, Jacek

1 0

Re: [PATCH 8/8] comctl32: Implement the legacy notifications during restore.
by Marvin 01 Jul '15

01 Jul '15

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://testbot.winehq.org/JobDetails.pl?Key=14894 Your paranoid android. === wvistau64 (64 bit toolbar) === No test summary line found === w2008s64 (64 bit toolbar) === No test summary line found

2 1

Re: kernel32: K32EnumProcessModules: Handle NULL pointer gracefully.
by Alex Henrie 01 Jul '15

01 Jul '15

> diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c > index f495e81..5461881 100644 > --- a/dlls/kernel32/module.c > +++ b/dlls/kernel32/module.c > @@ -1226,6 +1226,12 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, > if (!init_module_iterator(&iter, process)) > return FALSE; > > + if (!lphModule) > + { > + SetLastError(ERROR_NOACCESS); > + return FALSE; > + } > + > if (!needed) > { > SetLastError(ERROR_NOACCESS); Wouldn't it be easier to write "if (!lphModule || !needed)"? Adding a test or two would also be nice. -Alex

2 1

odbccp32: Implement SQLGetPrivateProfileString (try 6 - resend)
by Hugh McMaster 01 Jul '15

01 Jul '15

>+ LONG ret = 0; >+ HKEY hkey; >+ DWORD size = 0; >+ BOOL usedefault = TRUE; >+ /* snip */ >+ clear_errors(); >+ >+ if(!cbRetBuffer) >+ return 0; >+ >+ if(RetBuffer) >+ RetBuffer[0] = 0; >+ >+ if(!lpszSection || !lpszEntry || !lpszDefault || !RetBuffer || !cbRetBuffer) >+ return ret; You are checking "if (!cbRetBuffer)" twice. Same in the next function. You don't need to clear RetBuffer. RegGetValue adds a null terminating character if it doesn't already exist. You also "return 0" and "return ret". They are the same at the moment, so be consistent. >+size = cbRetBuffer; >+if(RegGetValueW(hkeysect, NULL, lpszEntry, RRF_RT_REG_SZ, &type, RetBuffer, &size) == ERROR_SUCCESS) cbRetBuffer is the size in characters of the buffer pointed to by RetBuffer.[1] size needs to be in bytes, so unless RetBuffer uses char, this is wrong. >+ ret = SQLGetPrivateProfileStringW(sect, entry, string, retval, cbRetBuffer, file); >+ if(ret) >+ { >+ WideCharToMultiByte(CP_ACP, 0, retval, -1, RetBuffer, ret+1, NULL, NULL); >+ } This doesn't look right to me. "ret+1" should be the size, in bytes, of RetBuffer. [2] [1] https://msdn.microsoft.com/en-us/library/windows/desktop/ms724868%28v=vs.85… [2] https://msdn.microsoft.com/en-us/library/windows/desktop/dd374130%28v=vs.85…

1 0

Re: [PATCH 1/6]: msvcp110: Add tr2_sys__Copy_file implementation and test.
by Piotr Caban 01 Jul '15

01 Jul '15

On 06/27/15 19:49, YongHaoHu wrote: > + ret = p_tr2_sys__Copy_file(tests[i].source, tests[i].dest, tests[i].fail_if_exists); > + ok(ret == GetLastError(), "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", i+1, GetLastError(), ret); > + ok(errno == 0xdeadbeef, "test_tr2_sys__Copy_file(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); Please check the return value of the function explicitly. Currently your implementation returns error while it should succeed and it's not visible in the tests. Thanks, Piotr

2 6

Proposal: to make binfmt-misc with wine workable and make Wine compadiblity modes more like Windows compadiblity mode.
by Peter Dolding 01 Jul '15

01 Jul '15

For binfmt-misc to be workable a few things need to be known. 1) What version of wine 2) What wineprefix 3) What setting overrides. None of these can be done by environmental vars because binfmt-misc might be directly executing the file. Windows compadiblity mode does not use the registry like wine does. Instead it done in two horible halves. Half 1. The application manifest file. The mainfest file may be embedded in the .exe file or be .exe.mainfest https://msdn.microsoft.com/en-us/library/windows/desktop/hh848036%28v=vs.85… Yes this is where you set what version of Windows application was designed to run with. So running XP mode on Windows 7 is here. Half 2. Application Compatilibity Database This is where it gets horible using shims on particular executables to make broken executables work. Also when this gets too large starts slowing windows down as it searching the database to make applications work. Yes reason some old applications don't work with Windows 10 that worked with 7 is that their entries were deleted from this database. To solve the problem I think we could get away with just Half the manifest can include library overrides and some windows configuration tweaks. But we have problems the include library information wine needs because of native and built-in libraries. Due to the fact wine is running on Linux and other OS's some of the configuration tweaks are going to be wine dependant. So we need another schema. http://wiki.winehq.org/UsefulRegistryKeys Because if Microsoft manifest would tolerate alien schema really everything under software\wine\appdefaults could be moved from the registry to the manifest. Advantage 1 this can be write protected per application and second advantage possibility of embedding in the exe itself. Also for binfmt-misc support have in the schema the means to record wineprefix and wine to use. So the program starting wine applications by binfmt-misc looks for either a mainfest or a winemainfest file in the same directory as the exe to see what wine environment the application should be running with. If there is no configured environment possibly ask user what wineprefix they do what to run the application with. What I do not know is if Microsoft application manifest file will tolerate an alien schema. Don't have different versions of Windows to test if Microsoft application manifest with a alien schema parts works or just causes windows to throw error or just results in the manifest being complete ignored. Now if Microsoft application manifest will not tolerate alien I have to ask would creating own own like exe.winemainfest be acceptable. I do hope Microsoft application manifest will tolerate alien because it would be really useful to have applications with a manifest a values saying what versions of wine they were tested with by the maker. Currently there is no way for a application vendor to record in the application they tested with wine. A lot of ways putting what shim modifications the application need in the manifest would also remove having to look up a huge database. Getting binfmt-misc working also will remove having to use setcap on wineloader instead of the .exe. Also would make if someone set a capicapity limitation by logind not break every wine application just because a few application where needing privileged operation.. So this alteration would be getting closer to how Windows does stuff and in the process making Linux integration better. Peter Dolding

4 7

Re: [PATCH 2/2] msvcp90: Implement time_get<char> ctors and dtors (try 2)
by Alexandre Julliard 01 Jul '15

01 Jul '15

Daniel Lehman <dlehman(a)esri.com> writes: > Try2: > - remove cast for Locinfo > - handle failed new() > - change 'unsigned int refs' to 'MSVCP_size_t refs' to match the rest of the file It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M msvcp60.dll -p msvcp60_test.exe.so ios && touch ios.ok wine: Unhandled page fault on write access to 0xd8003304 at address 0x7bc4e659 (thread 0009), starting debugger... Unhandled exception: page fault on write access to 0xd8003304 in 32-bit code (0x7bc4e659). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:7bc4e659 ESP:0032f4e4 EBP:0032f688 EFLAGS:00010216( R- -- I -A-P- ) EAX:d8003300 EBX:7bcc3540 ECX:00010000 EDX:75003300 ESI:00331c40 EDI:00000018 Stack dump: 0x0032f4e4: 00000000 0032f688 7bc4e4ab 00000000 0x0032f4f4: 00330000 00000000 00000000 00330000 0x0032f504: 00000000 00000002 00000014 00000000 0x0032f514: 7bc6b946 0032f540 00330014 00000000 0x0032f524: 7b8c57ac 0032f558 7bc6ad4a f7532361 0x0032f534: f75324a1 7ed54740 7bc6ad4a 7b810000 Backtrace: =>0 0x7bc4e659 RtlAllocateHeap+0x1e9(heap=<couldn't compute location>, flags=<couldn't compute location>, size=<couldn't compute location>) [/home/julliard/wine/wine/dlls/ntdll/../../include/wine/list.h:100] in ntdll (0x0032f688) 1 0x7eceb358 msvcrt_heap_alloc+0x57() in msvcrt (0x0032f6b8) 2 0x7eceb51c MSVCRT_operator_new+0x4b() in msvcrt (0x0032f6d8) 3 0x7eba526d locale__Locimp__Makexloc+0x49c(locinfo=0x32f780, cat=0x3f, locimp=0x3316d8, loc=(nil)) [/home/julliard/wine/wine/dlls/msvcp60/../msvcp90/locale.c:10584] in msvcp60 (0x0032f72c) 4 0x7eba5707 locale__Locimp__Makeloc+0x56(locinfo=0x32f780, cat=0x3f, locimp=0x3316d8, loc=(nil)) [/home/julliard/wine/wine/dlls/msvcp60/../msvcp90/locale.c:10617] in msvcp60 (0x0032f75c) 5 0x7eba5aba locale_ctor_cstr+0xb9(this=0x32f840, locname="German", cat=0x3f) [/home/julliard/wine/wine/dlls/msvcp60/../msvcp90/locale.c:10791] in msvcp60 (0x0032f7dc) 6 0x7eff37a4 test_num_get_get_double+0x353() [/home/julliard/wine/wine/dlls/msvcp60/tests/ios.c:910] in msvcp60_test (0x0032fc78) 7 0x7eff7212 func_ios+0xd91() [/home/julliard/wine/wine/dlls/msvcp60/tests/ios.c:1645] in msvcp60_test (0x0032fd58) 8 0x7eff3063 main+0x352(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/dlls/msvcp60/tests/../../../include/wine/test.h:584] in msvcp60_test (0x0032fe08) 9 0x7effac1f __wine_spec_exe_entry+0x6e(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in msvcp60_test (0x0032fe58) 10 0x7b85b55c call_process_entry+0xb() in kernel32 (0x0032fe78) 11 0x7b85c4ea start_process+0x59(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/kernel32/process.c:1104] in kernel32 (0x0032fea8) 12 0x7bc7a0b0 call_thread_func_wrapper+0xb() in ntdll (0x0032fec8) 13 0x7bc7cdc1 call_thread_func+0xb0(entry=0x7b85c490, arg=0x7ffdf000, frame=0x32ffc8) [/home/julliard/wine/wine/dlls/ntdll/signal_i386.c:2732] in ntdll (0x0032ffa8) 14 0x7bc7a08e call_thread_entry_point+0x11() in ntdll (0x0032ffc8) 15 0x7bc51b87 start_process+0x16(kernel_start=0x7b85c490) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2868] in ntdll (0x0032ffe8) 16 0xf75fd21d wine_call_on_stack+0x1c() in libwine.so.1 (0x00000000) 17 0xf75fd380 wine_switch_to_stack+0x1f(func=0x7bc51b70, arg=0x7b85c490, stack=0x330000) [/home/julliard/wine/wine/libs/wine/port.c:59] in libwine.so.1 (0xffb94238) 18 0x7bc56ef1 LdrInitializeThunk+0x1f0(kernel_start=<couldn't compute location>, unknown2=<couldn't compute location>, unknown3=<couldn't compute location>, unknown4=<couldn't compute location>) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2922] in ntdll (0xffb94278) 19 0x7b862213 __wine_kernel_init+0x9b2() [/home/julliard/wine/wine/dlls/kernel32/process.c:1276] in kernel32 (0xffb95168) 20 0x7bc57cb3 __wine_process_init+0x152() [/home/julliard/wine/wine/dlls/ntdll/loader.c:3131] in ntdll (0xffb951e8) 21 0xf75fae83 wine_init+0x2c2(argc=0x3, argv=0xffb95724, error="", error_size=0x400) [/home/julliard/wine/wine/libs/wine/loader.c:958] in libwine.so.1 (0xffb95238) 22 0x7bf00d6a main+0x79(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/loader/main.c:247] in <wine-loader> (0xffb95678) 23 0xf741ca63 __libc_start_main+0xf2() in libc.so.6 (0x00000000) 0x7bc4e659 RtlAllocateHeap+0x1e9 [/home/julliard/wine/wine/dlls/ntdll/../../include/wine/list.h:100] in ntdll: movl %edx,0x4(%eax) 100 elem->next->prev = elem->prev; -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: windowscodecs: Fix build failure on OSX.
by Austin English 30 Jun '15

30 Jun '15

On Tue, Jun 30, 2015 at 2:02 PM, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > The build failure unfortunately was introduced by my last patch > http://source.winehq.org/git/wine.git/commit/863f432a7d73b8b480a742fcbaf01d… > > Somehow I missed that this part is OSX specific and tested on Linux only - sorry for > the trouble. :/ The patch was tested by jam__ on IRC, would be nice if someone could > double check that no other warnings were introduced by my original commit. > > --- > dlls/windowscodecs/icnsformat.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c > index 54c7707..5d48a1a 100644 > --- a/dlls/windowscodecs/icnsformat.c > +++ b/dlls/windowscodecs/icnsformat.c > @@ -179,7 +179,7 @@ static ULONG WINAPI IcnsFrameEncode_Release(IWICBitmapFrameEncode *iface) > if (This->icns_image != NULL) > HeapFree(GetProcessHeap(), 0, This->icns_image); > > - IWICBitmapFrameEncode_Release(&This->encoder->IWICBitmapFrameEncode_iface); > + IWICBitmapEncoder_Release(&This->encoder->IWICBitmapEncoder_iface); > HeapFree(GetProcessHeap(), 0, This); > } > > -- > 2.4.4 > > With your patch applied, the build is fixed for me. There are 5 warnings, but they're unrelated to your patch (deprecated warnings): Austins-Mac-mini:windowscodecs austin$ make gcc -m32 -c -o icnsformat.o icnsformat.c -I. -I../../include -I/opt/local/include/libpng16 -D__WINESRC__ \ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body \ -Wignored-qualifiers -Wstrict-prototypes -Wtype-limits -Wvla -Wwrite-strings -Wpointer-arith \ -gdwarf-2 -gstrict-dwarf -fno-omit-frame-pointer -I/usr/X11/include -I/opt/local/include \ -I/usr/local/include -g -O2 icnsformat.c:430:11: warning: 'PtrToHand' is deprecated: first deprecated in OS X 10.8 [-Wdeprecated-declarations] ret = PtrToHand(This->icns_image, &handle, This->size * This->size * 4); ^ /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:1772:1: note: 'PtrToHand' has been explicitly marked deprecated here PtrToHand( ^ icnsformat.c:439:5: warning: 'DisposeHandle' is deprecated: first deprecated in OS X 10.8 [-Wdeprecated-declarations] DisposeHandle(handle); ^ /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:1278:1: note: 'DisposeHandle' has been explicitly marked deprecated here DisposeHandle(Handle h) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_8, __IPHONE_NA, __IPHONE_NA); ^ icnsformat.c:526:13: warning: 'DisposeHandle' is deprecated: first deprecated in OS X 10.8 [-Wdeprecated-declarations] DisposeHandle((Handle)This->icns_family); ^ /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:1278:1: note: 'DisposeHandle' has been explicitly marked deprecated here DisposeHandle(Handle h) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_8, __IPHONE_NA, __IPHONE_NA); ^ icnsformat.c:550:43: warning: 'NewHandle' is deprecated: first deprecated in OS X 10.8 [-Wdeprecated-declarations] This->icns_family = (IconFamilyHandle)NewHandle(0); ^ /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:451:1: note: 'NewHandle' has been explicitly marked deprecated here NewHandle(Size byteCount) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_8, __IPHONE_NA, __IPHONE_NA); ^ icnsformat.c:667:19: warning: 'GetHandleSize' is deprecated: first deprecated in OS X 10.8 [-Wdeprecated-declarations] buffer_size = GetHandleSize((Handle)This->icns_family); ^ /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:1356:1: note: 'GetHandleSize' has been explicitly marked deprecated here GetHandleSize(Handle h) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_8, __IPHONE_NA, __IPHONE_NA); ^ 5 warnings generated. -- -Austin

1 0

Re: odbccp32: Implement SQLGetPrivateProfileString (try 6 - resend)
by Nikolay Sivov 30 Jun '15

30 Jun '15

> + sect = heap_strdupAtoW(lpszSection); > + entry = heap_strdupAtoW(lpszEntry); > + string = heap_strdupAtoW(lpszDefault); > + file = heap_strdupAtoW(lpszFilename); > + retval = heap_alloc(cbRetBuffer*sizeof(WCHAR)); > + > + ret = SQLGetPrivateProfileStringW(sect, entry, string, retval, cbRetBuffer, file); > + if(ret) > + { > + WideCharToMultiByte(CP_ACP, 0, retval, -1, RetBuffer, ret+1, NULL, NULL); > + } > + > + heap_free(sect); > + heap_free(entry); > + heap_free(string); > + heap_free(file); > + > + heap_free(retval); I think it's still the same issue as last time - you're using WCHAR vs CHAR buffer lengths wrong, it might work for this function as long as it's always called with simple strings. But in general WideCharToMultiByte should not be used like that: 'cbRetBuffer' you got here is A-buffer length, yet you allocate W-buffer of this length. Later when you convert W->A you use return value from W-call as A-buffer length.

1 0

Re: d3dcompiler: Add D3DCompileFromFile, D3DCompile2 stubs (try 2)
by Matteo Bruni 30 Jun '15

30 Jun '15

2015-06-30 11:01 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Hi, > Removed #if > Corrected FIXME to be consistent with the reset of the file. > > Changelog: > d3dcompiler: Add D3DCompileFromFile, D3DCompile2 stubs > > > Best Regards > Alistair Leslie-Hughes I guess it's good enough for me. For your following patches: avoid LPxxx types, watch your whitespaces, no need to manually add '\n' in the middle of trace strings.

1 0

Re: [PATCH 0/8] advapi32: Fail on missing value or val_count parameters. (was advapi32: Fix RegEnumValueW when enumerating long values)
by Nikolay Sivov 30 Jun '15

30 Jun '15

On 30.06.2015 15:37, Bernhard Übelacker wrote: > Bug #38796: > RegEnumValue currently returns wrong minimum expected data_count when called without proper > value or val_count when the retrieved data (+overhead) exceeds the fixed buffer > variable in RegEnumValue. > > This series of patches does following: > - Add tests to cover calls to RegEnumValue without proper value and val_count parameters. > I think it's better to have tests committed first and change all other places after that.

1 0

Re: [PATCH 4/6]: msvcp110: Add tr2_sys__Stat implementation and test.
by Piotr Caban 30 Jun '15

30 Jun '15

On 06/27/15 19:50, YongHaoHu wrote: > +static file_type stat_set_error(int *err_code) > +{ > + file_type ret; > + *err_code = ERROR_SUCCESS; > + > + switch(GetLastError()) { > + case ERROR_FILE_NOT_FOUND: > + case ERROR_BAD_NETPATH: > + case ERROR_INVALID_NAME: > + case ERROR_BAD_PATHNAME: > + case ERROR_PATH_NOT_FOUND: > + ret = file_not_found; > + break; > + case ERROR_BAD_DEV_TYPE: > + ret = regular_file; > + break; > + default: > + ret = status_unknown; Shouldn't err_code be set to GetLastError in default case? You end up setting it to ERROR_SUCCESS in every case except if path is NULL. Why are you handling ERROR_BAD_DEV_TYPE error here? > + TRACE("(%s %p)\n", debugstr_a(path), err_code); > + DWORD attr; This will produce a compilation warning. Cheers, Piotr

2 4

Re: ntdll: Randomize security cookie when available (try 4)
by Alexandre Julliard 30 Jun '15

30 Jun '15

André Hentschel <nerv(a)dawncrow.de> writes: > @@ -1278,6 +1281,26 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz > } > } > > + > + /* randomize security cookie */ > + > + if (IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG < nt->OptionalHeader.NumberOfRvaAndSizes && > + (pos = nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].VirtualAddress)) > + { > + IMAGE_LOAD_CONFIG_DIRECTORY *loadcfg = (IMAGE_LOAD_CONFIG_DIRECTORY *)(ptr + pos); > + ULONG_PTR *cookie = (ULONG_PTR *)loadcfg->SecurityCookie; > + struct timeval tv; > + > + gettimeofday( &tv, NULL ); > + srand( tv.tv_usec * getpid() ); > + *cookie = rand(); That's not much better. It doesn't make sense to reset the seed on every call. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH]winecfg: Double click in dlls list to edit overides. (try 4)
by Nikolay Sivov 30 Jun '15

30 Jun '15

On 29.06.2015 12:35, Hao Peng wrote: > Add a feature to winecfg. User can double click in dlls list to edit > overides of selected item. > > superseded all earlier patches. > > --- > programs/winecfg/libraries.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > + case CBN_DBLCLK: > + if (LOWORD(wParam) == IDC_DLLS_LIST) > + { > + int index; > + POINT p; > + if (GetCursorPos(&p) && ScreenToClient((HWND)lParam, &p)) > + { > + index = SendDlgItemMessageW(hDlg, IDC_DLLS_LIST, > + LB_ITEMFROMPOINT, 0, MAKELPARAM(p.x, p.y)); > + if (!HIWORD(index)) > + on_edit_click(hDlg); > + } > + } > + break; Correct me if I'm wrong, but I don't think you get CBN_DBLCLK unless clicked on an item. Quick test with ControlSpy on Windows confirms that. And by the time you get CBN_DBLCLK something is always selected I think, which makes all that cursor complexity redundant.

2 2

Re: winedbg: Add be_xpoint_FAIL=-1 to enum be_xpoint_type.
by Michael Stefaniuc 30 Jun '15

30 Jun '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Thanks Gerald, On 06/30/2015 01:12 AM, Gerald Pfeifer wrote: > This replaces my original submission with a different approach. > > Recall this is about clang 3.4.1 complaining as follows: > > gdbproxy.c:2147:23: warning: comparison of constant -1 with > expression of type 'enum be_xpoint_type' is always false > > In my original submission I noted that "I see two ways to address > this: adding a dummy set to -1 to the enum, or casting the enum to > int before comparing against -1". > > Michael kindly provided feeback to go with the former approach. > This patch does that. (Thanks, Michael!) but can you please change the magic -1 to be_xpoint_FAIL too? > > Gerald --- programs/winedbg/be_cpu.h | 2 +- 1 file changed, 1 > insertion(+), 1 deletion(-) > > diff --git a/programs/winedbg/be_cpu.h b/programs/winedbg/be_cpu.h > index 889f638..c95ed7c 100644 --- a/programs/winedbg/be_cpu.h +++ > b/programs/winedbg/be_cpu.h @@ -20,7 +20,7 @@ > > enum be_cpu_addr {be_cpu_addr_pc, be_cpu_addr_stack, > be_cpu_addr_frame}; enum be_xpoint_type {be_xpoint_break, > be_xpoint_watch_exec, be_xpoint_watch_read, - > be_xpoint_watch_write}; + > be_xpoint_watch_write, be_xpoint_FAIL=-1}; I'd rather have be_xpoint_FAIL as first element in the enum. > struct backend_cpu { const DWORD machine; bye michael -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iD8DBQFVklO10ei8kcpE1VERAnKJAKCDf9tLHh2u4/mHPqdwjXTB/ol8MACcDQOx 1UIk4kBN8htbqwT0Wi3z5bo= =M6XR -----END PGP SIGNATURE-----

1 0

Re: [4/14]hid: Implement HidP_GetCaps
by Alexandre Julliard 30 Jun '15

30 Jun '15

Aric Stewart <aric(a)codeweavers.com> writes: > --- /dev/null > +++ b/include/wine/hid.h > @@ -0,0 +1,80 @@ > +/* > + * Wine internal HID structures > + * You shouldn't need a global header for internal structures. -- Alexandre Julliard julliard(a)winehq.org

5 7

Re: new patch
by Marvin 30 Jun '15

30 Jun '15

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

1 0

Re: [3/4] shell32: Release shell folders obtained via IFolderView_GetFolder.
by Matteo Bruni 29 Jun '15

29 Jun '15

2015-06-29 23:10 GMT+02:00 Thomas Faber <thomas.faber(a)reactos.org>: > As a consequence of the previous patch, Wine now leaks shell folder > references after calling GetFolder. This fixes the call sites to > release them. I think it would be better to merge this with the previous patch, to avoid the temporary regression.

1 0

Re: [4/4] shell32/tests: Remove a misleading test.
by Nikolay Sivov 29 Jun '15

29 Jun '15

Whole series looks good to me, thanks for working on this. On 30.06.2015 0:57, Thomas Faber wrote: > This removes the aforementioned test. Yes, this test was my doing. I guess I misinterpreted results, and static desktop impl hid the issue. By the way, regarding GetFolder(), msdn says that IShellItemArray is also supported, we probably can easily get away be using SHCreateShellItemArray; but that is a separate thing of course, that deserves its own patch and tests.

1 0

Re: d3dx9_36 [try 2]: Save multiplications and divisions to improve performance
by Matteo Bruni 29 Jun '15

29 Jun '15

2015-06-25 23:45 GMT+02:00 David Adam <david.adam.cnrs(a)gmail.com>: > Hi, > > I added a test with 65000 sides. All the test pass with a native d3dx9_36 > dll. You should have mentioned that the new test doesn't pass with the previous implementation, which is what makes this patch really convincing. So this patch is okay to me. Also notice that this in practice doesn't save any multiplication in the loop, at least with my version of GCC: the multiplication 2.0f * D3DX_PI was precalculated at compile time. A better patch title mentioning D3DXCreatePolygon would be nice. The tests generally have some room for improvement. As a followup it would be nice to try and improve them, maybe by replacing the comparison function with one which allows for a relative error and makes it possible to choose a potentially different error value for each test (to be able to lower those as much as possible). I would like to point you to some other place in Wine where the float comparison is done right but, on the spot, I only found relative_error + expect_color macros from d3dx9_36/tests/math.c which are really ugly. FWIW https://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbe… seems to be a good read on the subject.

1 0

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