- wine-devel - winehq.org

Re: gdiplus: Check for null in GdipGetFontHeight
by Vincent Povirk 05 Mar '17

05 Mar '17

This fails the gdiplus:font tests. font.c:550: Test failed: Expected 0, got 2 font.c:627: Test failed: font_height 63875314620738696996458594304.000000 != 15.691406 font.c:640: Test failed: font_height 63875314620738696996458594304.000000 != 15.691406 font.c:550: Test failed: Expected 0, got 2 font.c:668: Test failed: font_height 63875314620738696996458594304.000000 != 13.277344 font.c:681: Test failed: font_height 63875314620738696996458594304.000000 != 13.277344 font.c:550: Test failed: Expected 0, got 2 font.c:710: Test failed: font_height 63875314620738696996458594304.000000 != 15.691406

1 0

Re: [PATCH 4/4] user32: Only process sent messages from driver in PeekMessage().
by Marvin 05 Mar '17

05 Mar '17

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=29130 Your paranoid android. === w7u (32 bit win) === win.c:1003: Test failed: wrong dwWindowStatus: 0000 != 0001 active 00130156 fg 000301B4 in hook HCBT_MINMAX

1 0

Re: [PATCH 2/2] user32: scrollbars are vertical by default
by Nikolay Sivov 05 Mar '17

05 Mar '17

On 04.03.2017 23:29, Kees Beets wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=38029 > > Changed calculation of boolean vertical so that default is true. > > Tested on Ubuntu 16.04. > > Signed-off-by: kbeets68(a)gmail.com > --- > dlls/user32/scroll.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c > index 4b572e5..202fac8 100644 > --- a/dlls/user32/scroll.c > +++ b/dlls/user32/scroll.c > @@ -252,7 +252,7 @@ static BOOL SCROLL_GetScrollBarRect( HWND hwnd, INT nBar, RECT *lprect, > > case SB_CTL: > GetClientRect( hwnd, lprect ); > - vertical = ((wndPtr->dwStyle & SBS_VERT) != 0); > + vertical = ((wndPtr->dwStyle & SBS_HORZ) == 0); > break; > > default: > Hi, this doesn't look right, SBS_HORZ is 0, which makes 'vertical' always 1.

2 1

Re: GSOC 2017 - Resource/Dialog Editor
by Austin English 05 Mar '17

05 Mar '17

On Mar 3, 2017 3:16 AM, "Joseph-Eugene Winzer" <ml999(a)openmailbox.org> wrote: On 03/02/2017 10:45 PM, Austin English wrote: > On Thu, Mar 2, 2017 at 1:58 PM, Joe <ml999(a)openmailbox.org> wrote: > >> Hi, >> >> First of all, congrats for getting picked for another GSoC! >> Wine made my transition to Linux way easier and with more and more >> applications being supported the year of the desktop can come :) >> >> My name is Joseph Winzer and I am a bachelor math/CS student looking >> forward >> to contribute to open source in this year's GSoC. >> The 'Resource/Dialog Editor' project caught my eye as I remember a few >> years >> back digging through executables out of curiousity. Last time I looked >> for a >> resource editor it was either bundled with other software (Visual Studio, >> PellesC) or as mentioned in the project description bundled up with adware >> like ResEdit. >> I want to change that by contributing to Wine with an open source >> standalone >> editor anyone can use free of charge. >> Equipped with my Petzold, MSDN and the help of the community I am sure I >> will be able to realize this project. >> >> >> Looking forward working with you guys :) >> > > Hi Joseph, > > Thanks for your interest. Could you describe your experience with > C/Wine a bit? Have you thought about how you would implement/design > the resource editor at all? Could you share your plans? > > Thanks for your reply. So far, I experienced Wine exclusively from a user perspective, using it mostly for running games and apps I didn't find a substitute on Linux. I compiled Wine a few times when certain milestones were reached like improved D3D9 or bugfixes for certain apps. I did grep for stubs once in a while, browsed through the GDI implementation but wasn't confident enough to contribute. OK. Note that contributing a patch is a requirement of applicants. Patches related to the project are highly encouraged, but not required. I read more code than I wrote myself and most of it has been C or C-style C++. WinAPI-wise, I remember writing small games like connect four or apps where I tried to use what I had recently learned. I also did some reverse engineering for writing trainers or just for the fun of it. That has been awhile, though. What did you reverse engineer? If it's Microsoft code, or if you've seen Microsoft code, you're (in general) ineligible to contribute to Wine. More recently I looked at quake, tuxpaint, util-linux, .. whatever caught my interest. Concerning the technical aspects of implementing the editor, I haven't given it much thought yet. MSDN et al provide enough documentation to tackle the task and problems can be dealt with once they come up (I assume in my naivete). Design-wise it depends on what the Wine community expects it to be but personally I imagined ResEdit trimmed to reading out and altering resources with dialog creation on top. From there it can be extended in whatever direction the community sees fit. The rough sketch would be as follows: * Establishing bare bones UI (sidebar for items, main window as viewer) * Read PE compatible file resources * Export resources * Modify resources (substitute images, edit items) * Refining UI for editing/viewing This covers the basic functionality of the resource viewer. The Dialog Editor provides rendering of dialog elements what would complement part of the resource viewer and exporting as .rc. My estimate is that the dialog editor will be the biggest part of the project with parsing resources, dialog rendering, layout, .. Overall the planning and focus of the project depends on what the community expects it to be and if there is an immediate use case it can cover in Wine or thought of as a general tool. OK. Sorry for the wall of text but I hope I could describe to you my idea I have for it. Of course, in the official application the gaps for the implementation will be filled but getting feedback from the community first makes planning also easier for me. IMO walls of text are good. I'd rather see more text than brief descriptions that show a lack of thought/research ;) -- -Austin GPG: 14FB D7EA A041 937B

1 0

some source files are not listed at dl.winehq.org/wine/source/2.x/
by version2013＠openmailbox.org 04 Mar '17

04 Mar '17

https://dl.winehq.org/wine/source/2.x/ wine-2.2 and wine-2.3 are not listed. If I manually type the expected filename in the url, then I can download them.

4 4

Re: regedit/tests: Add some line concatenation tests
by Alexandre Julliard 03 Mar '17

03 Mar '17

Hugh McMaster <hugh.mcmaster(a)outlook.com> writes: > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > programs/regedit/tests/regedit.c | 24 ++++++++++++++++++++++++ > 1 file changed, 24 insertions(+) This fails here: ../../../tools/runtest -q -P wine -T ../../.. -M regedit.exe -p regedit.exe_test.exe.so regedit && touch regedit.ok regedit.c:484: Test succeeded inside todo block: Reg value shouldn't exist: Multi-Line2 regedit.c:496: Test succeeded inside todo block: Reg value shouldn't exist: Multi-Line4 Makefile:174: recipe for target 'regedit.ok' failed make[1]: *** [regedit.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: ntdll: Don't modify LockCount in RtlLeaveCriticalSection if section is not acquired.
by Sebastian Lackner 03 Mar '17

03 Mar '17

On 03.03.2017 18:48, Jacek Caban wrote: > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > --- > dlls/ntdll/critsection.c | 6 ++++- > dlls/ntdll/tests/rtl.c | 59 > ++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 64 insertions(+), 1 deletion(-) > > > > 0001-ntdll-Don-t-modify-LockCount-in-RtlLeaveCriticalSecti.diff > > > diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c > index e2eb364..e405b08 100644 > --- a/dlls/ntdll/critsection.c > +++ b/dlls/ntdll/critsection.c > @@ -665,7 +665,11 @@ BOOL WINAPI RtlIsCriticalSectionLockedByThread( RTL_CRITICAL_SECTION *crit ) > */ > NTSTATUS WINAPI RtlLeaveCriticalSection( RTL_CRITICAL_SECTION *crit ) > { > - if (--crit->RecursionCount) interlocked_dec( &crit->LockCount ); > + if (--crit->RecursionCount) > + { > + if (crit->RecursionCount > 0) interlocked_dec( &crit->LockCount ); > + else ERR( "section %p is not acquired\n", crit ); > + } > else > { > crit->OwningThread = 0; > diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c > index 43c26bd..4b6ee35 100644 > --- a/dlls/ntdll/tests/rtl.c > +++ b/dlls/ntdll/tests/rtl.c > @@ -98,6 +98,9 @@ static NTSTATUS (WINAPI *pRtlCompressBuffer)(USHORT, const UCHAR*, ULONG, PUCHA > static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(CRITICAL_SECTION *); > static BOOL (WINAPI *pRtlIsCriticalSectionLockedByThread)(CRITICAL_SECTION *); > static NTSTATUS (WINAPI *pRtlInitializeCriticalSectionEx)(CRITICAL_SECTION *, ULONG, ULONG); > +static NTSTATUS (WINAPI *pRtlInitializeCriticalSection)(CRITICAL_SECTION *); > +static NTSTATUS (WINAPI *pRtlEnterCriticalSection)(RTL_CRITICAL_SECTION *); > +static NTSTATUS (WINAPI *pRtlLeaveCriticalSection)(RTL_CRITICAL_SECTION *); > > static HMODULE hkernel32 = 0; > static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); > @@ -151,6 +154,9 @@ static void InitFunctionPtrs(void) > pRtlIsCriticalSectionLocked = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLocked"); > pRtlIsCriticalSectionLockedByThread = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLockedByThread"); > pRtlInitializeCriticalSectionEx = (void *)GetProcAddress(hntdll, "RtlInitializeCriticalSectionEx"); > + pRtlInitializeCriticalSection = (void *)GetProcAddress(hntdll, "RtlInitializeCriticalSection"); > + pRtlEnterCriticalSection = (void *)GetProcAddress(hntdll, "RtlEnterCriticalSection"); > + pRtlLeaveCriticalSection = (void *)GetProcAddress(hntdll, "RtlLeaveCriticalSection"); Those functions should not require dynamic loading. The *Ex function is only loaded dynamically because it was introduced in later Windows versions. > } > hkernel32 = LoadLibraryA("kernel32.dll"); > ok(hkernel32 != 0, "LoadLibrary failed\n"); > @@ -2094,6 +2100,58 @@ static void test_RtlInitializeCriticalSectionEx(void) > RtlDeleteCriticalSection(&cs); > } > > +static void test_RtlLeaveCriticalSection(void) > +{ > + RTL_CRITICAL_SECTION cs; > + NTSTATUS status; > + > + pRtlInitializeCriticalSection(&cs); > + > + status = pRtlEnterCriticalSection(&cs); > + ok(!status, "RtlEnterCriticalSection failed: %x\n", status); > + todo_wine > + ok(cs.LockCount == -2, "expected LockCount == -2, got %d\n", cs.LockCount); Some of these tests seem to fail on XP (see testbot). > + ok(cs.RecursionCount == 1, "expected RecursionCount == 1, got %d\n", cs.RecursionCount); > + ok(cs.OwningThread == ULongToHandle(GetCurrentThreadId()), "unexpected OwningThread\n"); > + > + status = pRtlLeaveCriticalSection(&cs); > + ok(!status, "RtlLeaveCriticalSection failed: %x\n", status); > + ok(cs.LockCount == -1, "expected LockCount == -1, got %d\n", cs.LockCount); > + ok(cs.RecursionCount == 0, "expected RecursionCount == 0, got %d\n", cs.RecursionCount); > + ok(!cs.OwningThread, "unexpected OwningThread %p\n", cs.OwningThread); > + > + /* > + * Trying to leave a section that wasn't acquired modifies RecusionCount to an invalid values, Should this be "invalid value" ? > + * but doesn't modify LockCount so that an attempt to enter the section later will work. > + */ > + status = pRtlLeaveCriticalSection(&cs); > + ok(!status, "RtlLeaveCriticalSection failed: %x\n", status); > + ok(cs.LockCount == -1, "expected LockCount == -1, got %d\n", cs.LockCount); > + ok(cs.RecursionCount == -1, "expected RecursionCount == -1, got %d\n", cs.RecursionCount); > + ok(!cs.OwningThread, "unexpected OwningThread %p\n", cs.OwningThread); > + > + /* and again */ > + status = pRtlLeaveCriticalSection(&cs); > + ok(!status, "RtlLeaveCriticalSection failed: %x\n", status); > + ok(cs.LockCount == -1, "expected LockCount == -1, got %d\n", cs.LockCount); > + ok(cs.RecursionCount == -2, "expected RecursionCount == -1, got %d\n", cs.RecursionCount); Copy and paste error in the ok message. > + ok(!cs.OwningThread, "unexpected OwningThread %p\n", cs.OwningThread); > + > + /* entering section fixes RecursionCount */ > + status = pRtlEnterCriticalSection(&cs); > + ok(!status, "RtlEnterCriticalSection failed: %x\n", status); > + todo_wine > + ok(cs.LockCount == -2, "expected LockCount == -2, got %d\n", cs.LockCount); > + ok(cs.RecursionCount == 1, "expected RecursionCount == 1, got %d\n", cs.RecursionCount); > + ok(cs.OwningThread == ULongToHandle(GetCurrentThreadId()), "unexpected OwningThread\n"); > + > + status = pRtlLeaveCriticalSection(&cs); > + ok(!status, "RtlLeaveCriticalSection failed: %x\n", status); > + ok(cs.LockCount == -1, "expected LockCount == -1, got %d\n", cs.LockCount); > + ok(cs.RecursionCount == 0, "expected RecursionCount == 0, got %d\n", cs.RecursionCount); > + ok(!cs.OwningThread, "unexpected OwningThread %p\n", cs.OwningThread); Please delete the critical section after the test to avoid leaks. > +} > + > START_TEST(rtl) > { > InitFunctionPtrs(); > @@ -2125,4 +2183,5 @@ START_TEST(rtl) > test_RtlDecompressBuffer(); > test_RtlIsCriticalSectionLocked(); > test_RtlInitializeCriticalSectionEx(); > + test_RtlLeaveCriticalSection(); > } > > >

3 3

Re: ntdll: Don't modify LockCount in RtlLeaveCriticalSection if section is not acquired.
by Marvin 03 Mar '17

03 Mar '17

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=29096 Your paranoid android. === wxppro (32 bit rtl) === rtl.c:2113: Test failed: expected LockCount == -2, got 0 rtl.c:2129: Test failed: expected LockCount == -1, got -2 rtl.c:2136: Test failed: expected LockCount == -1, got -3 ntdll:rtl has unreported failures

1 0

Re: [PATCH 2/2] ntdll: Fix NtFlushBuffersFile() for files with FILE_APPEND_DATA access.
by Paul Gofman 03 Mar '17

03 Mar '17

Sorry for introducing that in f7d40d45da7a1bc0accd58bca6d6da4e34861937. I just verified that server_get_unix_fd() returns success if to request FILE_APPEND_DATA for handles created with (read/)write access. I also checked that requesting FILE_APPEND_DATA gets no error if using it with a usb serial port. Is it anything bad to just use FILE_APPEND_DATA instead of FILE_WRITE_DATA in server_get_unix_fd()? If its not that I am missing something why it should not be done like that, I can add test for serial port. On 03/03/2017 06:21 PM, Józef Kucia wrote: > This fixes a regression introduced by commit > f7d40d45da7a1bc0accd58bca6d6da4e34861937. > > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > dlls/ntdll/file.c | 2 ++ > dlls/ntdll/tests/file.c | 1 - > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c > index 3f38c6f..e2cfe7f 100644 > --- a/dlls/ntdll/file.c > +++ b/dlls/ntdll/file.c > @@ -3418,6 +3418,8 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK* IoStatusBlock > int fd, needs_close; > > ret = server_get_unix_fd( hFile, FILE_WRITE_DATA, &fd, &needs_close, &type, NULL ); > + if (ret == STATUS_ACCESS_DENIED) > + ret = server_get_unix_fd( hFile, FILE_APPEND_DATA, &fd, &needs_close, &type, NULL ); > > if (!ret && type == FD_TYPE_SERIAL) > { > diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c > index 5e7e1ee..09bf688 100644 > --- a/dlls/ntdll/tests/file.c > +++ b/dlls/ntdll/tests/file.c > @@ -4441,7 +4441,6 @@ static void test_flush_buffers_file(void) > ok(hfile != INVALID_HANDLE_VALUE, "could not open temp file, error %d.\n", GetLastError()); > > status = pNtFlushBuffersFile(hfile, &io_status_block); > - todo_wine > ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); > > CloseHandle(hfile);

2 1

GSOC 2017 - Resource/Dialog Editor
by Joe 03 Mar '17

03 Mar '17

Hi, First of all, congrats for getting picked for another GSoC! Wine made my transition to Linux way easier and with more and more applications being supported the year of the desktop can come :) My name is Joseph Winzer and I am a bachelor math/CS student looking forward to contribute to open source in this year's GSoC. The 'Resource/Dialog Editor' project caught my eye as I remember a few years back digging through executables out of curiousity. Last time I looked for a resource editor it was either bundled with other software (Visual Studio, PellesC) or as mentioned in the project description bundled up with adware like ResEdit. I want to change that by contributing to Wine with an open source standalone editor anyone can use free of charge. Equipped with my Petzold, MSDN and the help of the community I am sure I will be able to realize this project. Looking forward working with you guys :)

3 2

Re: [PATCH 1/2] ws2_32/tests: Rework WSAStringToAddress tests
by Marvin 03 Mar '17

03 Mar '17

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=29078 Your paranoid android. === w2008s64 (64 bit sock) === ws2_32:sock returned an error (3221225477) despite having no failures ws2_32:sock has no test summary line (early exit of the main process?)

2 1

Re: [PATCH] ws2_32: Turn SIO_GET_EXTENSION_FUNCTION_POINTER into a table
by Sebastian Lackner 02 Mar '17

02 Mar '17

On 02.03.2017 06:38, Bruno Jesus wrote: > From: Bruno Jesus <bjesus(a)codeweavers.com> > > I could not find any better way to avoid compilation warning than using a typedef for the function pointer. If there is a better way I'm all ears. > > Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> > --- > dlls/ws2_32/socket.c | 94 +++++++++++++++++++++++----------------------------- > 1 file changed, 41 insertions(+), 53 deletions(-) It works fine here without any typedefs: --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4945,10 +4945,8 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (found) { - typedef void (*func_ptr)(void); - TRACE("-> got %s\n", guid_funcs[i].name); - *(func_ptr *)out_buff = guid_funcs[i].func_ptr; + *(void **)out_buff = guid_funcs[i].func_ptr; break; } What kind of compiler warning do you get?

2 1

Re: [PATCH 2/2] comctl32/propsheet: Implement PSPCB_ADDREF/PSPCB_RELEASE notifications
by Dmitry Timoshkov 02 Mar '17

02 Mar '17

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > dlls/comctl32/propsheet.c | 41 +++++++++++++++++++++++++++++++++++------ > dlls/comctl32/tests/propsheet.c | 4 ---- > 2 files changed, 35 insertions(+), 10 deletions(-) And of course it's a pure coincidence that you immediately started to work on PSPCB_ADDREF/PSPCB_RELEASE once a patch for it has been added to wine-staging. I'd suggest to stop such ill-behaved practices, or at least give a credit to the source if you decided to "borrow" an idea. Or is this an indication that you just ran out of your own ideas to work on? :) -- Dmitry.

3 4

Re: [PATCH 1/2] mciavi32: Implement MCI_BREAK
by Andrew Eikum 02 Mar '17

02 Mar '17

On Wed, Mar 01, 2017 at 04:10:43AM -0300, Bruno Jesus wrote: > + wma->mci_break.flags = dwFlags; > + wma->mci_break.parms = *lpParms; The rest of this looks OK to me, but please guard access to wma's members with wma->cs. Andrew

1 0

Re: [v2 2/4] dinput: Handle username in EnumDevicesBySemantics.
by Andrew Eikum 02 Mar '17

02 Mar '17

Thanks for fixing these up, they look good to me. However this patch introduces a test failure: dinput.c:573: Test succeeded inside todo block: No device should be available after action mapping available=0 dinput.c:596: Test succeeded inside todo block: This user should own no devices owned=0 This is obviously fixed by your 4/4 patch, but we like to keep the tests clean in every commit. It's fine to squash the test changes into the code changes to create a 2-patch sequence with no test failures. Then I think it should be good to go in. Thanks, Andrew On Thu, Mar 02, 2017 at 12:11:24AM +0200, Jetro Jormalainen wrote: > EnumDevicesBySemantics enums only devices with given username when > DIEDBSFL_THISUSER is set and only unowned devices when > DIEDBSFL_AVAILABLEDEVICES is set. > > v2: Fixed problems noted by Andrew Eikum. > > Tested on Arch Linux and Rally Trophy Demo. > > Signed-off-by: Jetro Jormalainen <jje-wine(a)jv.jetro.fi> > --- > dlls/dinput/dinput_main.c | 111 +++++++++++++++++++++++++++++++++++++++------- > 1 file changed, 96 insertions(+), 15 deletions(-) > > diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c > index 2bf9f38ba4..a59217472c 100644 > --- a/dlls/dinput/dinput_main.c > +++ b/dlls/dinput/dinput_main.c > @@ -923,6 +923,47 @@ static HRESULT WINAPI IDirectInput8WImpl_FindDevice(LPDIRECTINPUT8W iface, REFGU > return IDirectInput2WImpl_FindDevice( &This->IDirectInput7W_iface, rguid, pszName, pguidInstance ); > } > > +static BOOL should_enumerate_device(const WCHAR *username, DWORD dwFlags, > + struct list *device_players, REFGUID guid) > +{ > + BOOL should_enumerate = TRUE; > + struct DevicePlayer *device_player; > + > + /* Check if user owns this device */ > + if (dwFlags & DIEDBSFL_THISUSER && username && *username) > + { > + should_enumerate = FALSE; > + LIST_FOR_EACH_ENTRY(device_player, device_players, struct DevicePlayer, entry) > + { > + if (IsEqualGUID(&device_player->instance_guid, guid)) > + { > + if (*device_player->username && !lstrcmpW(username, device_player->username)) > + return TRUE; /* Device username matches */ > + break; > + } > + } > + } > + > + /* Check if this device is not owned by anyone */ > + if (dwFlags & DIEDBSFL_AVAILABLEDEVICES) { > + BOOL found = FALSE; > + should_enumerate = FALSE; > + LIST_FOR_EACH_ENTRY(device_player, device_players, struct DevicePlayer, entry) > + { > + if (IsEqualGUID(&device_player->instance_guid, guid)) > + { > + if (*device_player->username) > + found = TRUE; > + break; > + } > + } > + if (!found) > + return TRUE; /* Device does not have a username */ > + } > + > + return should_enumerate; > +} > + > static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( > LPDIRECTINPUT8A iface, LPCSTR ptszUserName, LPDIACTIONFORMATA lpdiActionFormat, > LPDIENUMDEVICESBYSEMANTICSCBA lpCallback, > @@ -939,6 +980,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( > int device_count = 0; > int remain; > DIDEVICEINSTANCEA *didevis = 0; > + WCHAR *username_w = 0; > > FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, debugstr_a(ptszUserName), lpdiActionFormat, > lpCallback, pvRef, dwFlags); > @@ -955,6 +997,14 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( > > didevi.dwSize = sizeof(didevi); > > + if (ptszUserName) > + { > + int len = MultiByteToWideChar(CP_ACP, 0, ptszUserName, -1, 0, 0); > + > + username_w = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); > + MultiByteToWideChar(CP_ACP, 0, ptszUserName, -1, username_w, len); > + } > + > /* Enumerate all the joysticks */ > for (i = 0; i < NB_DINPUT_DEVICES; i++) > { > @@ -968,7 +1018,8 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( > > /* Default behavior is to enumerate attached game controllers */ > enumSuccess = dinput_devices[i]->enum_deviceA(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); > - if (enumSuccess == S_OK) > + if (enumSuccess == S_OK && > + should_enumerate_device(username_w, dwFlags, &This->device_players, &didevi.guidInstance)) > { > if (device_count++) > didevis = HeapReAlloc(GetProcessHeap(), 0, didevis, sizeof(DIDEVICEINSTANCEA)*device_count); > @@ -980,8 +1031,15 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( > } > > remain = device_count; > + /* Add keyboard and mouse to remaining device count */ > if (!(dwFlags & DIEDBSFL_FORCEFEEDBACK)) > - remain += sizeof(guids)/sizeof(guids[0]); > + { > + for (i = 0; i < sizeof(guids) / sizeof(guids[0]); i++) > + { > + if (should_enumerate_device(username_w, dwFlags, &This->device_players, guids[i])) > + remain++; > + } > + } > > for (i = 0; i < device_count; i++) > { > @@ -991,26 +1049,38 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( > if (lpCallback(&didevis[i], lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP) > { > HeapFree(GetProcessHeap(), 0, didevis); > + HeapFree(GetProcessHeap(), 0, username_w); > return DI_OK; > } > } > > HeapFree(GetProcessHeap(), 0, didevis); > > - if (dwFlags & DIEDBSFL_FORCEFEEDBACK) return DI_OK; > + if (dwFlags & DIEDBSFL_FORCEFEEDBACK) > + { > + HeapFree(GetProcessHeap(), 0, username_w); > + return DI_OK; > + } > > /* Enumerate keyboard and mouse */ > for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) > { > - callbackFlags = diactionformat_priorityA(lpdiActionFormat, actionMasks[i]); > + if (should_enumerate_device(username_w, dwFlags, &This->device_players, guids[i])) > + { > + callbackFlags = diactionformat_priorityA(lpdiActionFormat, actionMasks[i]); > > - IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); > - IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); > + IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); > + IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); > > - if (lpCallback(&didevi, lpdid, callbackFlags, sizeof(guids)/sizeof(guids[0]) - (i+1), pvRef) == DIENUM_STOP) > - return DI_OK; > + if (lpCallback(&didevi, lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP) > + { > + HeapFree(GetProcessHeap(), 0, username_w); > + return DI_OK; > + } > + } > } > > + HeapFree(GetProcessHeap(), 0, username_w); > return DI_OK; > } > > @@ -1049,7 +1119,8 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( > > /* Default behavior is to enumerate attached game controllers */ > enumSuccess = dinput_devices[i]->enum_deviceW(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); > - if (enumSuccess == S_OK) > + if (enumSuccess == S_OK && > + should_enumerate_device(ptszUserName, dwFlags, &This->device_players, &didevi.guidInstance)) > { > if (device_count++) > didevis = HeapReAlloc(GetProcessHeap(), 0, didevis, sizeof(DIDEVICEINSTANCEW)*device_count); > @@ -1061,8 +1132,15 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( > } > > remain = device_count; > + /* Add keyboard and mouse to remaining device count */ > if (!(dwFlags & DIEDBSFL_FORCEFEEDBACK)) > - remain += sizeof(guids)/sizeof(guids[0]); > + { > + for (i = 0; i < sizeof(guids) / sizeof(guids[0]); i++) > + { > + if (should_enumerate_device(ptszUserName, dwFlags, &This->device_players, guids[i])) > + remain++; > + } > + } > > for (i = 0; i < device_count; i++) > { > @@ -1083,13 +1161,16 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( > /* Enumerate keyboard and mouse */ > for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) > { > - callbackFlags = diactionformat_priorityW(lpdiActionFormat, actionMasks[i]); > + if (should_enumerate_device(ptszUserName, dwFlags, &This->device_players, guids[i])) > + { > + callbackFlags = diactionformat_priorityW(lpdiActionFormat, actionMasks[i]); > > - IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); > - IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); > + IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); > + IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); > > - if (lpCallback(&didevi, lpdid, callbackFlags, sizeof(guids)/sizeof(guids[0]) - (i+1), pvRef) == DIENUM_STOP) > - return DI_OK; > + if (lpCallback(&didevi, lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP) > + return DI_OK; > + } > } > > return DI_OK; > -- > 2.11.0 > > >

1 0

Re: [PATCH v3 1/5] winebus.sys: Handle linux input event device via udev
by Sebastian Lackner 01 Mar '17

01 Mar '17

I haven't done a full review yet, but here are some first comments. On 01.03.2017 17:16, Aric Stewart wrote: > + subsystem = udev_device_get_subsystem(dev); > usbdev = udev_device_get_parent_with_subsystem_devtype(dev, "usb", "usb_device"); > if (usbdev) > { > + #ifdef HAS_PROPER_INPUT_HEADER > + const platform_vtbl *other_vtbl = NULL; > + DEVICE_OBJECT *dup = NULL; > + if (strcmp(subsystem, "hidraw") == 0) > + other_vtbl = &lnxev_vtbl; > + else if (strcmp(subsystem, "input") == 0) > + other_vtbl = &hidraw_vtbl; > + > + if (other_vtbl) > + dup = bus_enumerate_hid_devices(other_vtbl, check_same_device, dev); Shouldn't we have some preference of either hidraw or linux event devices? Otherwise this could lead to different results in each run. > } > > +DEVICE_OBJECT* bus_enumerate_hid_devices(const platform_vtbl *vtbl, enum_func function, void* context) > +{ > + struct pnp_device *dev; > + DEVICE_OBJECT *ret = NULL; > + > + TRACE("(%p)\n", vtbl); > + > + EnterCriticalSection(&device_list_cs); > + LIST_FOR_EACH_ENTRY(dev, &pnp_devset, struct pnp_device, entry) > + { > + struct device_extension *ext = (struct device_extension *)dev->device->DeviceExtension; > + if (ext->vtbl != vtbl) continue; > + if (function(dev->device, context) == 0) > + ret = dev->device; > + break; This is wrong and will always abort after the first function call. > + } > + LeaveCriticalSection(&device_list_cs); > + return ret; > +} > +

2 1

Re: [PATCH 3/6] wined3d: Handle raw thread group shared memory declarations.
by Sebastian Lackner 01 Mar '17

01 Mar '17

On 28.02.2017 14:42, Józef Kucia wrote: > + reg_maps->tgsm_count = reg_idx + 1; Wouldn't it be better to set it to max(reg_maps->tgsm_count, ...) to allow decreasing reg indices (even if not seen in practice yet)? Alternatively you could also get rid of this variable and update patch 6 to check the index against the capacity. Best regards, Sebastian

2 1

Re: [PATCH 2/2] winmm: Dispatch MCI_BREAK to the driver
by Sebastian Lackner 01 Mar '17

01 Mar '17

On 01.03.2017 08:10, Bruno Jesus wrote: > + TRACE("(%08x, %08X, vkey %04X\n", wDevID, dwFlags, lpParms->nVirtKey); Did you forget to add a ")" ?

2 1

Re: [PATCH 1/2] server: Added server side named pipe read and write implementation and use it for message mode pipes.
by Sebastian Lackner 01 Mar '17

01 Mar '17

On 28.02.2017 14:14, Jacek Caban wrote: > + LIST_FOR_EACH_ENTRY( message, &pipe_end->message_queue, struct pipe_message, entry ) > + avail += message->iosb->in_size - message->read_pos; > + reply_size = min( reply_size, avail ); > + > + if (avail) > + { > + message = LIST_ENTRY( list_head(&pipe_end->message_queue), struct pipe_message, entry ); > + reply_size = min( reply_size, message->iosb->in_size ); > + } Isn't there a problem with this size check? Lets assume we have two messages with 10 byte, for the first one the read_pos = 5. Then avail == 15, and reply_size is clamped to 10 - but it will attempt to copy 10 bytes starting position 5? > + > + if (!(buffer = set_reply_data_size(FIELD_OFFSET( FILE_PIPE_PEEK_BUFFER, Data[reply_size] )))) return; > + buffer->NamedPipeState = 0; /* FIXME */ > + buffer->ReadDataAvailable = avail; > + buffer->NumberOfMessages = 0; /* FIXME */ > + buffer->MessageLength = 0; /* FIXME */ > + if (avail) memcpy( buffer->Data, (const char *)message->iosb->in_data + message->read_pos, reply_size ); > +} > +

2 1

Re: [PATCH v3] oledb32: Correct length calculation in DataConvert for DBTYPE_STR
by Huw Davies 01 Mar '17

01 Mar '17

On Tue, Feb 28, 2017 at 11:17:29PM +0000, Alistair Leslie-Hughes wrote: > --- a/dlls/oledb32/convert.c > +++ b/dlls/oledb32/convert.c > @@ -816,23 +816,23 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, > case DBTYPE_STR: > { > BSTR b; > - DBLENGTH bstr_len; > + DBLENGTH length; > INT bytes_to_copy; > - hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &bstr_len, > + hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &length, > src, &b, sizeof(BSTR), src_status, dst_status, > precision, scale, flags); > if(hr != S_OK) return hr; > - bstr_len = SysStringLen(b); > - *dst_len = bstr_len * sizeof(char); /* Doesn't include size for '\0' */ > + *dst_len = SysStringLen(b); /* Doesn't include size for '\0' */ You've gone back to confusing the length of a BSTR with the length of the char * str. We seem to be going round in circles here, so I've just sent in the correct fix. Please take a look at it to figure out where you were going wrong. Huw.

1 0

Re: [PATCH] d3dx9_36/tests: Fix a memory leak in test_createtext.
by Matteo Bruni 01 Mar '17

01 Mar '17

2017-02-27 7:52 GMT+01:00 Alex Henrie <alexhenrie24(a)gmail.com>: > diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c > index 95dd06e466..64b7b8823c 100644 > --- a/dlls/d3dx9_36/tests/mesh.c > +++ b/dlls/d3dx9_36/tests/mesh.c > @@ -4340,8 +4340,7 @@ static void test_createtext(IDirect3DDevice9 *device, HDC hdc, const char *text, > if (!compute_text_mesh(&mesh, text, deviation, extrusion, otm.otmEMSquare, glyphs)) > { > skip("Couldn't create mesh\n"); > - d3dxmesh->lpVtbl->Release(d3dxmesh); > - return; > + goto error; > } > mesh.fvf = D3DFVF_XYZ | D3DFVF_NORMAL; I would go in the other direction and strip all the error checking branches and gotos from those tests. compute_text_mesh() returns FALSE only on allocation failure and that's not supposed to happen in the controlled conditions of the test. It's probably better to just fail and crash in those cases.

2 1

Re: [PATCH 2/2] wineinstall - Add support for parallel builds using 'nproc' to detect cpu count
by Austin English 28 Feb '17

28 Feb '17

On Fri, Feb 24, 2017 at 6:30 PM, Chris Morgan <chmorgan(a)gmail.com> wrote: > Parallel builds can greatly reduce the overall build time on modern multi-core processors. > > Fall back to two parallel builds in the case where nproc is unavailable, most modern > processors have at least two cores. > > Use the 'NPROC' value defined by the environment if it is not null. > > Signed-off-by: Chris Morgan <chmorgan(a)gmail.com> > --- > tools/wineinstall | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/tools/wineinstall b/tools/wineinstall > index bfd62e3..080d590 100755 > --- a/tools/wineinstall > +++ b/tools/wineinstall > @@ -143,10 +143,19 @@ echo "in the meantime..." > echo > std_sleep > > +# If the NPROC environment variable isn't set use nproc, if available, to determine > +# the number of processors in the system, if not, fall back to a default NPROC value > +if type nproc2 &>/dev/null I don't think this will do what you want ;) Also, I'm pretty sure &> isn't Posix. You'd want something like: if type nproc > /dev/null 2>&1 -- -Austin GPG: 14FB D7EA A041 937B

5 7

Re: [PATCH] oledb32/tests: Fix a use-after-free in test_converttobyrefwstr.
by Alistair Leslie-Hughes 28 Feb '17

28 Feb '17

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>

1 0

Re: [v2] Use CP 1200 (Unicode) for Win32/Win64 version info.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > [v2] Fix test failures in mshtml.dll caused by npmshtml.dll. > According to Gecko Plugin API Reference[1], plugin's version stamp must > be set to English US and Windows Multilingual, i.e. "040904E4". > [1] https://developer.mozilla.org/en-US/docs/Plugins/Guide/Plug-in_Development_… > > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/npmshtml/rsrc.rc | 1 + > dlls/version/tests/info.c | 2 -- > include/wine/wine_common_ver.rc | 24 ++++++++++++++++++++++-- > 3 files changed, 23 insertions(+), 4 deletions(-) It's still failing here: ../../../tools/runtest -q -P wine -T ../../.. -M mshtml.dll -p mshtml_test.exe.so htmldoc && touch htmldoc.ok htmldoc.c:6287: Test failed: open failed: 80040152 wine: Unhandled page fault on read access to 0xdeadbeef at address 0x7ed051dd (thread 0154), starting debugger... Unhandled exception: page fault on read access to 0xdeadbeef in 32-bit code (0x7ed051dd). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:7ed051dd ESP:0033fc20 EBP:0033fc78 EFLAGS:00010202( R- -- I - - - ) EAX:deadbeef EBX:7ed6a000 ECX:00000001 EDX:7ed80f00 ESI:0000188d EDI:7ed4388a Stack dump: 0x0033fc20: 00000001 7ed449d1 80040152 7ed050ad 0x0033fc30: 005e0000 00689650 005e8de8 00000000 0x0033fc40: 7ed39473 7ed7f1a0 80040152 7ed4388a 0x0033fc50: 005b4d80 7ed4388a 005e8de8 deadbeef 0x0033fc60: 7ed4521a 00000000 7ed04f0e 7ed6a000 0x0033fc70: 005b4d80 7ed4388a 0033fcd8 7ed0ddd9 Backtrace: =>0 0x7ed051dd test_open_window+0x2dd(doc=<is not available>, do_block=0) [/home/julliard/wine/wine/dlls/mshtml/tests/../../../include/mshtml.h:51848] in mshtml_test (0x0033fc78) 1 0x7ed0ddd9 test_HTMLDocument_http+0x678(with_wbapp=<is not available>) [/home/julliard/wine/wine/dlls/mshtml/tests/htmldoc.c:7877] in mshtml_test (0x0033fcd8) 2 0x7ed128d9 func_htmldoc+0xda8() [/home/julliard/wine/wine/dlls/mshtml/tests/htmldoc.c:8742] in mshtml_test (0x0033fd58) 3 0x7ecc305d main+0x25c(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/dlls/mshtml/tests/../../../include/wine/test.h:589] in mshtml_test (0x0033fe08) 4 0x7ed38d8b __wine_spec_exe_entry+0x4a(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in mshtml_test (0x0033fe48) 5 0x7b45e56c call_process_entry+0xb() in kernel32 (0x0033fe68) 6 0x7b45f4a9 start_process+0x68(entry=<couldn't compute location>) [/home/julliard/wine/wine/dlls/kernel32/process.c:1116] in kernel32 (0x0033fea8) 7 0x7bc8071c call_thread_func_wrapper+0xb() in ntdll (0x0033fec8) 8 0x7bc834d9 call_thread_func+0xa8(entry=0x7b45f440, arg=0x7ed38d40, frame=0x33ffc8) [/home/julliard/wine/wine/dlls/ntdll/signal_i386.c:2759] in ntdll (0x0033ffa8) 9 0x7bc806fa call_thread_entry_point+0x11() in ntdll (0x0033ffc8) 10 0x7bc53f73 start_process+0x12(arg=0xffcb6418) [/home/julliard/wine/wine/dlls/ntdll/loader.c:3054] in ntdll (0x0033ffe8) 11 0xf756d8dd __x86.get_pc_thunk.di+0x2a() in libwine.so.1 (0x00000000) 12 0xf756da40 wine_switch_to_stack+0x1f(func=0x7bc53f60, arg=0xffcb6418, stack=0x340000) [/home/julliard/wine/wine/libs/wine/port.c:77] in libwine.so.1 (0xffcb63e8) 13 0x7bc59b26 LdrInitializeThunk+0x235(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:3115] in ntdll (0xffcb6438) 14 0x7b4653af __wine_kernel_init+0xa4e() [/home/julliard/wine/wine/dlls/kernel32/process.c:1310] in kernel32 (0xffcb7328) 15 0x7bc5a983 __wine_process_init+0x152() [/home/julliard/wine/wine/dlls/ntdll/loader.c:3324] in ntdll (0xffcb7398) 16 0xf756bb43 wine_init+0x2a2(argc=0x3, argv=0xffcb78e4, error="", error_size=0x400) [/home/julliard/wine/wine/libs/wine/loader.c:956] in libwine.so.1 (0xffcb73e8) 17 0x7c000b58 main+0x97(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/loader/main.c:254] in <wine-loader> (0xffcb7838) 18 0xf7375276 __libc_start_main+0xf5() in libc.so.6 (0x00000000) 0x7ed051dd test_open_window+0x2dd [/home/julliard/wine/wine/dlls/mshtml/tests/../../../include/mshtml.h:51848] in mshtml_test: movl 0x0(%eax),%edx 51848 return This->lpVtbl->close(This); -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/6] wined3d: Handle raw thread group shared memory declarations.
by Henri Verbeet 28 Feb '17

28 Feb '17

On 28 February 2017 at 14:42, Józef Kucia <jkucia(a)codeweavers.com> wrote: > @@ -1047,6 +1047,31 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st > { > reg_maps->temporary_count = ins.declaration.count; > } > + else if (ins.handler_idx == WINED3DSIH_DCL_TGSM_RAW) > + { > + unsigned int reg_idx = ins.declaration.tgsm_raw.reg.reg.idx[0].offset; > + if (reg_idx >= MAX_TGSM_REGISTERS) > + { > + ERR("Invalid TGSM register index %u.\n", reg_idx); > + break; > + } > + if (shader_version.type == WINED3D_SHADER_TYPE_COMPUTE) > + { > + struct wined3d_shader_tgsm *tgsm; > + > + if (!wined3d_array_reserve((void **)&reg_maps->tgsm, &reg_maps->tgsm_capacity, > + reg_idx + 1, sizeof(*reg_maps->tgsm))) I'm not sure about this. I guess the expectation is that these will get allocated consecutively and starting from 0, while even starting at MAX_TGSM_REGISTERS-1 and going down wouldn't be terrible. Still, I'm wondering if it wouldn't be worth it to only allocate space for the number of declarations, and use e.g. bsearch().

2 1

Re: [PATCH 1/5] wined3d: Use the command stream state in wined3d_cs_exec_draw().
by Sebastian Lackner 28 Feb '17

28 Feb '17

On 28.02.2017 06:11, Henri Verbeet wrote: > Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> > --- > dlls/wined3d/cs.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > This patch causes corrupted graphics in multiple games. The problem is caused by uninitialized memory in the wined3d_state structs. Currently the struct is only cleared in wined3d_cs_exec_reset_state, but it probably should be cleared always when WINED3D_STATE_INIT_DEFAULT is passed, otherwise the CS and the main state can go out of sync. Could you please take a look? Example app (~40 MB): https://archive.org/download/MotoRacer2Demo/MotoRacer2Demo.zip (sha256: 02c8523d61619b9f65d874e15af9838ebf78938a720c5b61504d97c0b7cc68c9) Best regards, Sebastian

2 2

Re: tools: remove wineinstall
by Dmitry Timoshkov 28 Feb '17

28 Feb '17

Austin English <austinenglish(a)gmail.com> wrote: > -2. QUICK START > - > -Whenever you compile from source, it is recommended to use the Wine > -Installer to build and install Wine. From the top-level directory > -of the Wine source (which contains this file), run: > - > -./tools/wineinstall > - > -Run programs as "wine program". For more information and problem > -resolution, read the rest of this file, the Wine man page, and > -especially the wealth of information found at http://www.winehq.org. Perhaps the 2nd part of this section should stay since it doesn't have anything to do with the wineinstall script. And regarding compilation it's worth to at least mention wiki/docs/forums I'd guess. -- Dmitry.

1 0

Re: Proposal: winetest 'context'
by Sebastian Lackner 27 Feb '17

27 Feb '17

On 27.02.2017 20:19, Mark Jansen wrote: > This syntax is a lot better, > however it will break when ':' is used in the format string. > It might be a better idea to keep a list of indexes alongside the > context buffer? Not sure if its required. I think it would be a bit confusing when ":" is used inside of a context string. If devs want to use ":" as separator for variables they could also do something like: with_context("i=%d", i) with_context("j=%d", j) { // here some tests } > > As for the name, use_context or set_context ? That would also be fine, but I don't think its much better than with_context(). > > regards, > > Mark Jansen > > On Mon, Feb 27, 2017 at 12:06 AM, Sebastian Lackner > <sebastian(a)fds-team.de> wrote: >> On 25.02.2017 13:34, Józef Kucia wrote: >>> On Tue, Feb 14, 2017 at 5:04 PM, Mark Jansen <learn0more+wine(a)gmail.com> wrote: >>>> Hello, >>>> >>>> Often when testing something, helper functions are introduced that are >>>> called with different data (for example when iterating over tables). >>>> >>>> Attached patch (winetest_set_context.diff) is a proposal that allows >>>> tests to specify a 'context', that will be printed in the failure >>>> message. >>>> This way, the actual test code does not have to prefix every case with >>>> a trace, or include the data in every test macro. >>>> The patch is written so that tests do not have to use this mechanism, >>>> so there is no need to convert all tests at once. >>>> Second attachment (winetest_ctx_example.diff) shows how an existing >>>> test could be converted to use this new technique. >>> >>> For what it's worth, if we had a mechanism to set a context for test >>> messages, I would gladly use it in d3d11 tests. >>> >>> Cheers, >>> Józef >> >> I would also like to see such a feature, however I'm not really happy with >> a single context string which has to be set and reset manually. So, here is >> an alternative proposal which allows to use a block-syntax like: >> >> --- snip --- >> with_context("i = %d, j = %d", i, j) >> { >> // here some tests >> } >> --- snip --- >> >> Blocks can also be nested, and its easy to combine them with a loop: >> >> --- snip --- >> for (i = 0; i < 100; i++) with_context("test %d", i) >> { >> // here some tests (don't use break!) >> } >> --- snip --- >> >> The only disadvantage is that we need variadic macros (__VA_ARGS__), but it >> looks like they are already used in a bunch of other tests, so thats probably >> not a real problem. Please let me know what you think about this method, and >> also if you have suggestions for a better name. >> >> Best regards, >> Sebastian >>

1 0

The Wine Project has been accepted as a GSoC 2017 mentor organization!
by André Hentschel 27 Feb '17

27 Feb '17

I just invited a lot of possible Mentors, if I missed someone, please let me know

1 0

Re: [1/4] dinput: Keep username same between device objects.
by Bruno Jesus 27 Feb '17

27 Feb '17

On Wed, Feb 22, 2017 at 8:22 PM, Jetro Jormalainen <jje-wine(a)jv.jetro.fi> wrote: > Tested on Windows 10, Windows XP and Arch Linux. Hi, thanks for the patches. In order to help testing do you mind explaining how to test them? Like is there any game demo/freeware that is able to benefit from the patches?

2 1

Re: [PATCH 3/5] winebus.sys: Process device reports for linux event devices
by Sebastian Lackner 27 Feb '17

27 Feb '17

On 27.02.2017 16:09, Aric Stewart wrote: > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/winebus.sys/bus_udev.c | 163 +++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 162 insertions(+), 1 deletion(-) > > > > 0003-winebus.sys-Process-device-reports-for-linux-event-dev.txt > > > diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c > index e2a475ccd8..2f198c7d4f 100644 > --- a/dlls/winebus.sys/bus_udev.c > +++ b/dlls/winebus.sys/bus_udev.c > @@ -242,6 +242,9 @@ struct wine_input_absinfo { > struct wine_input_private { > struct platform_private base; > > + int buffer_length; > + BYTE *report_buffer; > + > int report_descriptor_size; > BYTE *report_descriptor; > > @@ -340,6 +343,87 @@ static const BYTE* what_am_I(struct udev_device *dev) > return Unknown; > } > > +static BOOL set_button_value(struct wine_input_private *ext, int code, int value) > +{ > + int index = ext->button_map[code]; > + int bindex = index / 8; > + int b = index % 8; > + BYTE mask; > + > + mask = 1<<b; > + if (value) > + ext->report_buffer[bindex] = ext->report_buffer[bindex] | mask; > + else > + { > + mask = ~mask; > + ext->report_buffer[bindex] = ext->report_buffer[bindex] & mask; > + } > + return TRUE; > +} > + > +static BOOL set_abs_axis_value(struct wine_input_private *ext, int code, int value) > +{ > + int index; > + /* check for hatswitches */ > + if (code <= ABS_HAT3Y && code >= ABS_HAT0X) > + { > + index = code - ABS_HAT0X; > + ext->hat_values[index] = value; > + if ((code - ABS_HAT0X) % 2) > + index--; > + if (ext->hat_values[index] == 0) > + { > + if (ext->hat_values[index+1] == 0) > + value = 8; > + else if (ext->hat_values[index+1] < 0) > + value = 0; > + else > + value = 4; > + } > + else if (ext->hat_values[index] > 0) > + { > + if (ext->hat_values[index+1] == 0) > + value = 2; > + else if (ext->hat_values[index+1] < 0) > + value = 1; > + else > + value = 3; > + } > + else > + { > + if (ext->hat_values[index+1] == 0) > + value = 6; > + else if (ext->hat_values[index+1] < 0) > + value = 7; > + else > + value = 5; > + } > + ext->report_buffer[ext->hat_map[index]] = value; > + return TRUE; > + } > + else if (code < HID_ABS_MAX && ABS_to_HID_map[code][0] != 0) > + { > + index = ext->abs_map[code].report_index; > + *((WORD*)&ext->report_buffer[index]) = MulDiv(value, 0xff, ext->abs_map[code].info.maximum - ext->abs_map[code].info.minimum); > + return TRUE; > + } > + return FALSE; > +} > + > +static BOOL set_rel_axis_value(struct wine_input_private *ext, int code, int value) > +{ > + int index; > + if (code < HID_REL_MAX && REL_to_HID_map[code][0] != 0) > + { > + index = ext->rel_map[code]; > + if (value > 127) value = 127; > + if (value < -127) value = -127; > + ext->report_buffer[index] = value; > + return TRUE; > + } > + return FALSE; > +} > + > static VOID build_report_descriptor(struct wine_input_private *ext, struct udev_device *dev) > { > int abs_pages[TOP_ABS_PAGE][HID_ABS_MAX+1]; > @@ -510,6 +594,37 @@ static VOID build_report_descriptor(struct wine_input_private *ext, struct udev_ > memcpy(report_ptr, report_tail, sizeof(report_tail)); > > ext->report_descriptor_size = descript_size; > + ext->buffer_length = report_size; > + ext->report_buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, report_size); > + > + /* Initialize axis in the report */ > + for (i = 0; i < HID_ABS_MAX; i++) > + if (test_bit(absbits, i)) > + set_abs_axis_value(ext, i, ext->abs_map[i].info.value); > +} > + > +static BOOL set_report_from_event(struct wine_input_private *ext, struct input_event *ie) > +{ > + switch(ie->type) > + { > +#ifdef EV_SYN > + case EV_SYN: > + return FALSE; > +#endif > +#ifdef EV_MSC > + case EV_MSC: > + return FALSE; > +#endif > + case EV_KEY: > + return set_button_value(ext, ie->code, ie->value); > + case EV_ABS: > + return set_abs_axis_value(ext, ie->code, ie->value); > + case EV_REL: > + return set_rel_axis_value(ext, ie->code, ie->value); > + default: > + ERR("TODO: Process Report (%i, %i)\n",ie->type, ie->code); > + return FALSE; > + } > } > #endif > > @@ -846,9 +961,52 @@ static NTSTATUS lnxev_get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buff > return STATUS_NOT_IMPLEMENTED; > } > > +static DWORD CALLBACK lnxev_device_report_thread(void *args) > +{ > + DEVICE_OBJECT *device = (DEVICE_OBJECT*)args; > + struct wine_input_private *private = input_impl_from_DEVICE_OBJECT(device); > + struct pollfd plfds[2]; > + > + plfds[0].fd = private->base.device_fd; > + plfds[0].events = POLLIN; > + plfds[0].revents = 0; > + plfds[1].fd = private->base.control_pipe[0]; > + plfds[1].events = POLLIN; > + plfds[1].revents = 0; > + > + while (1) > + { > + int size; > + struct input_event ie; > + > + if (poll(plfds, 2, -1) <= 0) continue; > + if (plfds[1].revents || !private->report_buffer || private->buffer_length == 0) It would be better to catch memory allocation failures earlier than while processing device reports. > + break; > + size = read(plfds[0].fd, &ie, sizeof(ie)); > + if (size == -1) > + TRACE_(hid_report)("Read failed. Likely an unplugged device\n"); > + else if (size == 0) > + TRACE_(hid_report)("Failed to read report\n"); > + else if (set_report_from_event(private, &ie)) > + process_hid_report(device, private->report_buffer, private->buffer_length); > + } > + return 0; > +} > + > static NTSTATUS lnxev_begin_report_processing(DEVICE_OBJECT *device) > { > - return STATUS_NOT_IMPLEMENTED; > + struct wine_input_private *private = input_impl_from_DEVICE_OBJECT(device); > + You have to check that the thread was not started yet. > + pipe(private->base.control_pipe); Some error handling wouldn't hurt. > + private->base.report_thread = CreateThread(NULL, 0, lnxev_device_report_thread, device, 0, NULL); > + if (!private->base.report_thread) > + { > + ERR("Unable to create device report thread\n"); > + close(private->base.control_pipe[0]); > + close(private->base.control_pipe[1]); > + return STATUS_UNSUCCESSFUL; > + } > + return STATUS_SUCCESS; > } > > static NTSTATUS lnxev_set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written) > @@ -990,6 +1148,9 @@ static void try_remove_device(struct udev_device *dev) > close(private->control_pipe[0]); > close(private->control_pipe[1]); > CloseHandle(private->report_thread); > +#ifdef HAS_PROPER_INPUT_HEADER > + HeapFree(GetProcessHeap(), 0, ((struct wine_input_private*)private)->report_buffer); It looks like this will attempt to release an invalid pointer for hidraw devices. > +#endif > } > > dev = private->udev_device; > > >

1 0

Re: [2/4] dinput: Handle username in EnumDevicesBySemantics.
by Andrew Eikum 27 Feb '17

27 Feb '17

On Thu, Feb 23, 2017 at 01:22:19AM +0200, Jetro Jormalainen wrote: > @@ -955,6 +998,14 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( > > didevi.dwSize = sizeof(didevi); > > + if (ptszUserName) > + { > + username_size = MultiByteToWideChar(CP_ACP, 0, ptszUserName, -1, 0, 0); > + MultiByteToWideChar(CP_ACP, 0, ptszUserName, -1, username_w, username_size); Normally, we use the return from MultiByteToWideChar to allocate the destination buffer. You could switch to that. I'm not opposed to doing it on the stack like this, but then there's no need for username_size. You can just pass the size of the buffer in WCHARs as the last param of MultiByteToWideChar. Andrew

1 0

Re: [1/4] dinput: Keep username same between device objects.
by Andrew Eikum 27 Feb '17

27 Feb '17

On Thu, Feb 23, 2017 at 01:22:18AM +0200, Jetro Jormalainen wrote: > @@ -1308,11 +1308,24 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, > case (DWORD_PTR) DIPROP_USERNAME: > { > LPDIPROPSTRING ps = (LPDIPROPSTRING)pdiph; > + struct DevicePlayer *device_player; > > if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; > > - lstrcpynW(ps->wsz, This->username, sizeof(ps->wsz)/sizeof(WCHAR)); > - break; > + LIST_FOR_EACH_ENTRY(device_player, &This->dinput->device_players, > + struct DevicePlayer, entry) > + { > + if (IsEqualGUID(&device_player->guid, &This->guid)) > + { > + if (lstrlenW(device_player->username)) Please use *username instead of strlen in places where we don't actually care about the string length. Same in the other patch. > @@ -1390,10 +1403,32 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( > case (DWORD_PTR) DIPROP_USERNAME: > { > LPCDIPROPSTRING ps = (LPCDIPROPSTRING)pdiph; > + struct DevicePlayer *device_player; > + unsigned char found = 0; Please use BOOL, TRUE, and FALSE for booleans. Some people use those symbols for their static analyzers. Same in the other patch. > @@ -56,6 +57,12 @@ struct dinput_device { > HRESULT (*create_device)(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPVOID *pdev, int unicode); > }; > > +struct DevicePlayer { > + GUID guid; "guid" is a little vague. This refers to the specific device instance, right? Maybe device_guid or instance_guid? Andrew

1 0

Re: [PATCH 2/5] winebus.sys: Build device reports for linux event devices
by Sebastian Lackner 27 Feb '17

27 Feb '17

On 27.02.2017 16:09, Aric Stewart wrote: > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/winebus.sys/bus_udev.c | 437 +++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 435 insertions(+), 2 deletions(-) > > > > 0002-winebus.sys-Build-device-reports-for-linux-event-devic.txt > > > diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c > index 2dcc7fb442..e2a475ccd8 100644 > --- a/dlls/winebus.sys/bus_udev.c > +++ b/dlls/winebus.sys/bus_udev.c > @@ -63,6 +63,10 @@ > #include "wine/debug.h" > #include "wine/unicode.h" > > +#ifdef HAS_PROPER_INPUT_HEADER > +# include "hidusage.h" > +#endif > + > #include "bus.h" > > WINE_DEFAULT_DEBUG_CHANNEL(plugplay); > @@ -97,6 +101,418 @@ static inline struct platform_private *impl_from_DEVICE_OBJECT(DEVICE_OBJECT *de > return (struct platform_private *)get_platform_private(device); > } > > +#ifdef HAS_PROPER_INPUT_HEADER > +static const BYTE report_header[] = { > + 0x05, 0x01, /* USAGE_PAGE (Generic Desktop) */ > + 0x09, 0x00, /* USAGE (??) */ > + 0xa1, 0x01, /* COLLECTION (Application) */ > + 0x09, 0x01, /* USAGE () */ > + 0xa1, 0x00, /* COLLECTION (Physical) */ > +}; > + > +#define IDX_HEADER_PAGE 1 > +#define IDX_HEADER_USAGE 3 > + > +static const BYTE report_buttons[] = { > + 0x05, 0x09, /* USAGE_PAGE (Button) */ > + 0x19, 0x01, /* USAGE_MINIMUM (Button 1) */ > + 0x29, 0x03, /* USAGE_MAXIMUM (Button 3) */ > + 0x15, 0x00, /* LOGICAL_MINIMUM (0) */ > + 0x25, 0x01, /* LOGICAL_MAXIMUM (1) */ > + 0x35, 0x00, /* LOGICAL_MINIMUM (0) */ > + 0x45, 0x01, /* LOGICAL_MAXIMUM (1) */ > + 0x95, 0x03, /* REPORT_COUNT (3) */ > + 0x75, 0x01, /* REPORT_SIZE (1) */ > + 0x81, 0x02, /* INPUT (Data,Var,Abs) */ > +}; > +#define IDX_BUTTON_MIN_USAGE 3 > +#define IDX_BUTTON_MAX_USAGE 5 > +#define IDX_BUTTON_COUNT 11 > + > +static const BYTE report_padding[] = { > + 0x95, 0x03, /* REPORT_COUNT (3) */ > + 0x75, 0x01, /* REPORT_SIZE (1) */ > + 0x81, 0x03, /* INPUT (Cnst,Var,Abs) */ > +}; > +#define IDX_PADDING_BIT_COUNT 1 > + > +static const BYTE report_axis_header[] = { > + 0x05, 0x01, /* USAGE_PAGE (Generic Desktop) */ > +}; > +#define IDX_AXIS_PAGE 1 > + > + > +static const BYTE report_axis_usage[] = { > + 0x09, 0x30, /* USAGE (X) */ > +}; > +#define IDX_AXIS_USAGE 1 > + > +static const BYTE report_abs_axis_tail[] = { > + 0x16, 0x00, 0x00, /* LOGICAL_MINIMUM (0) */ > + 0x26, 0xff, 0x00, /* LOGICAL_MAXIMUM (0xff) */ > + 0x35, 0x00, /* PHYSICAL_MINIMUM (0) */ > + 0x46, 0xff, 0x00, /* PHYSICAL_MAXIMUM (256) */ > + 0x75, 0x10, /* REPORT_SIZE (16) */ > + 0x95, 0x00, /* REPORT_COUNT (2) */ > + 0x81, 0x02, /* INPUT (Data,Var,Abs) */ > +}; > +#define IDX_ABS_AXIS_COUNT 14 > + > +static const BYTE report_rel_axis_tail[] = { > + 0x15, 0x81, /* LOGICAL_MINIMUM (0) */ > + 0x25, 0x7f, /* LOGICAL_MAXIMUM (0xffff) */ > + 0x75, 0x08, /* REPORT_SIZE (16) */ > + 0x95, 0x02, /* REPORT_COUNT (2) */ > + 0x81, 0x06, /* INPUT (Data,Var,Rel) */ > +}; > +#define IDX_REL_AXIS_COUNT 7 > + > +static const BYTE report_hatswitch[] = { > + 0x05, 0x01, /* USAGE_PAGE (Generic Desktop) */ > + 0x09, 0x39, /* USAGE (Hatswitch) */ > + 0x15, 0x00, /* LOGICAL_MINIMUM (0) */ > + 0x25, 0x08, /* LOGICAL_MAXIMUM (0x08) */ > + 0x35, 0x00, /* PHYSICAL_MINIMUM (0) */ > + 0x45, 0x08, /* PHYSICAL_MAXIMUM (8) */ > + 0x75, 0x08, /* REPORT_SIZE (8) */ > + 0x95, 0x01, /* REPORT_COUNT (1) */ > + 0x81, 0x02, /* INPUT (Data,Var,Abs) */ > +}; > +#define IDX_HATSWITCH_COUNT 15 > + > +static const BYTE report_tail[] = { > + 0xc0, /* END_COLLECTION */ > + 0xc0 /* END_COLLECTION */ > +}; > + > +static const BYTE ABS_to_HID_map[][2] = { > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_X}, /*ABS_X*/ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Y}, /*ABS_Y*/ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Z}, /*ABS_Z*/ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RX}, /*ABS_RX*/ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RY}, /*ABS_RY*/ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RZ}, /*ABS_RZ*/ > + {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_THROTTLE}, /*ABS_THROTTLE*/ > + {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_RUDDER}, /*ABS_RUDDER*/ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_WHEEL}, /*ABS_WHEEL*/ > + {HID_USAGE_PAGE_SIMULATION, 0xC4}, /*ABS_GAS*/ > + {HID_USAGE_PAGE_SIMULATION, 0xC5}, /*ABS_BRAKE*/ > + {0,0}, /*ABS_HAT0X*/ > + {0,0}, /*ABS_HAT0Y*/ > + {0,0}, /*ABS_HAT1X*/ > + {0,0}, /*ABS_HAT1Y*/ > + {0,0}, /*ABS_HAT2X*/ > + {0,0}, /*ABS_HAT2Y*/ > + {0,0}, /*ABS_HAT3X*/ > + {0,0}, /*ABS_HAT3Y*/ > + {HID_USAGE_PAGE_DIGITIZER, 0x30}, /*ABS_PRESSURE*/ > + {0, 0}, /*ABS_DISTANCE*/ > + {HID_USAGE_PAGE_DIGITIZER, 0x3D}, /*ABS_TILT_X*/ > + {HID_USAGE_PAGE_DIGITIZER, 0x3F}, /*ABS_TILT_Y*/ > + {0, 0}, /*ABS_TOOL_WIDTH*/ > + {0, 0}, > + {0, 0}, > + {0, 0}, > + {HID_USAGE_PAGE_CONSUMER, 0xE0} /*ABS_VOLUME*/ > +}; > +#define HID_ABS_MAX (ABS_VOLUME+1) > +#define TOP_ABS_PAGE (HID_USAGE_PAGE_DIGITIZER+1) > + > +static const BYTE REL_to_HID_map[][2] = { > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_X}, /* REL_X */ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Y}, /* REL_Y */ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Z}, /* REL_Z */ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RX}, /* REL_RX */ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RY}, /* REL_RY */ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_RZ}, /* REL_RZ */ > + {0, 0}, /* REL_HWHEEL */ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_DIAL}, /* REL_DIAL */ > + {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_WHEEL}, /* REL_WHEEL */ > + {0, 0} /* REL_MISC */ > +}; > + > +#define HID_REL_MAX (REL_MISC+1) > +#define TOP_REL_PAGE (HID_USAGE_PAGE_CONSUMER+1) > + > +struct wine_input_absinfo { > + struct input_absinfo info; > + BYTE report_index; > +}; > + > +struct wine_input_private { > + struct platform_private base; > + > + int report_descriptor_size; > + BYTE *report_descriptor; > + > + BYTE button_map[KEY_MAX]; > + BYTE rel_map[HID_REL_MAX]; > + BYTE hat_map[8]; > + int hat_values[8]; > + struct wine_input_absinfo abs_map[HID_ABS_MAX]; > +}; > + > +#define test_bit(arr,bit) (((BYTE*)(arr))[(bit)>>3]&(1<<((bit)&7))) > + > +static BYTE *add_button_block(BYTE* report_ptr, BYTE usage_min, BYTE usage_max) > +{ > + memcpy(report_ptr, report_buttons, sizeof(report_buttons)); > + report_ptr[IDX_BUTTON_MIN_USAGE] = usage_min; > + report_ptr[IDX_BUTTON_MAX_USAGE] = usage_max; > + report_ptr[IDX_BUTTON_COUNT] = (usage_max - usage_min) + 1; > + return report_ptr + sizeof(report_buttons); > +} > + > +static BYTE *add_axis_block(BYTE *report_ptr, BYTE count, BYTE page, BYTE *usages, BOOL absolute) > +{ > + int i; > + memcpy(report_ptr, report_axis_header, sizeof(report_axis_header)); > + report_ptr[IDX_AXIS_PAGE] = page; > + report_ptr += sizeof(report_axis_header); > + for (i = 0; i < count; i++) > + { > + memcpy(report_ptr, report_axis_usage, sizeof(report_axis_usage)); > + report_ptr[IDX_AXIS_USAGE] = usages[i]; > + report_ptr += sizeof(report_axis_usage); > + } > + if (absolute) > + { > + memcpy(report_ptr, report_abs_axis_tail, sizeof(report_abs_axis_tail)); > + report_ptr[IDX_ABS_AXIS_COUNT] = count; > + report_ptr += sizeof(report_abs_axis_tail); > + } > + else > + { > + memcpy(report_ptr, report_rel_axis_tail, sizeof(report_rel_axis_tail)); > + report_ptr[IDX_REL_AXIS_COUNT] = count; > + report_ptr += sizeof(report_rel_axis_tail); > + } > + return report_ptr; > +} > + > +static BYTE *add_padding_block(BYTE *report_ptr, BYTE bitcount) > +{ > + memcpy(report_ptr, report_padding, sizeof(report_padding)); > + report_ptr[IDX_PADDING_BIT_COUNT] = bitcount; > + return report_ptr + sizeof(report_padding); > +} > + > +static BYTE *add_hatswitch(BYTE *report_ptr, INT count) > +{ > + memcpy(report_ptr, report_hatswitch, sizeof(report_hatswitch)); > + report_ptr[IDX_HATSWITCH_COUNT] = count; > + return report_ptr + sizeof(report_hatswitch); > +} > + > +static const BYTE* what_am_I(struct udev_device *dev) > +{ > + static const BYTE Unknown[2] = {HID_USAGE_PAGE_GENERIC, 0}; > + static const BYTE Mouse[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_MOUSE}; > + static const BYTE Keyboard[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_KEYBOARD}; > + static const BYTE Gamepad[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_GAMEPAD}; > + static const BYTE Keypad[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_KEYPAD}; > + static const BYTE Tablet[2] = {HID_USAGE_PAGE_DIGITIZER, 0x2}; > + static const BYTE Touchscreen[2] = {HID_USAGE_PAGE_DIGITIZER, 0x4}; > + static const BYTE Touchpad[2] = {HID_USAGE_PAGE_DIGITIZER, 0x5}; > + > + struct udev_device *parent = dev; > + > + /* Look to the parents until we get a clue */ > + while (parent) > + { > + if (udev_device_get_property_value(parent, "ID_INPUT_MOUSE")) > + return Mouse; > + else if (udev_device_get_property_value(parent, "ID_INPUT_KEYBOARD")) > + return Keyboard; > + else if (udev_device_get_property_value(parent, "ID_INPUT_JOYSTICK")) > + return Gamepad; > + else if (udev_device_get_property_value(parent, "ID_INPUT_KEY")) > + return Keypad; > + else if (udev_device_get_property_value(parent, "ID_INPUT_TOUCHPAD")) > + return Touchpad; > + else if (udev_device_get_property_value(parent, "ID_INPUT_TOUCHSCREEN")) > + return Touchscreen; > + else if (udev_device_get_property_value(parent, "ID_INPUT_TABLET")) > + return Tablet; > + > + parent = udev_device_get_parent_with_subsystem_devtype(parent, "input", NULL); > + } > + return Unknown; > +} > + > +static VOID build_report_descriptor(struct wine_input_private *ext, struct udev_device *dev) > +{ > + int abs_pages[TOP_ABS_PAGE][HID_ABS_MAX+1]; > + int rel_pages[TOP_REL_PAGE][HID_REL_MAX+1]; > + BYTE absbits[(ABS_MAX+7)/8]; > + BYTE relbits[(REL_MAX+7)/8]; > + BYTE keybits[(KEY_MAX+7)/8]; > + BYTE *report_ptr; > + INT i, descript_size; > + INT report_size; > + INT button_count, abs_count, rel_count, hat_count; > + const BYTE *device_usage = what_am_I(dev); > + > + if (ioctl(ext->base.device_fd, EVIOCGBIT(EV_REL, sizeof(relbits)), relbits) == -1) > + { > + WARN("ioctl(EVIOCGBIT, EV_REL) failed: %d %s\n", errno, strerror(errno)); > + return; > + } > + if (ioctl(ext->base.device_fd, EVIOCGBIT(EV_ABS, sizeof(absbits)), absbits) == -1) > + { > + WARN("ioctl(EVIOCGBIT, EV_ABS) failed: %d %s\n", errno, strerror(errno)); > + return; > + } > + if (ioctl(ext->base.device_fd, EVIOCGBIT(EV_KEY, sizeof(keybits)), keybits) == -1) > + { > + WARN("ioctl(EVIOCGBIT, EV_KEY) failed: %d %s\n", errno, strerror(errno)); > + return; > + } > + > + descript_size = sizeof(report_header) + sizeof(report_tail); > + report_size = 0; > + > + /* For now lump all buttons just into incremental usages, Ignore Keys */ > + button_count = 0; > + for (i = BTN_MISC; i < KEY_MAX; i++) > + { > + if (test_bit(keybits, i)) > + { > + ext->button_map[i] = button_count; > + button_count++; > + } > + } > + if (button_count) > + { > + descript_size += sizeof(report_buttons); > + if (button_count % 8) > + descript_size += sizeof(report_padding); > + report_size = (button_count + 7) / 8; > + } > + > + abs_count = 0; > + memset(abs_pages, 0, sizeof(abs_pages)); > + for (i = 0; i < HID_ABS_MAX; i++) > + if (test_bit(absbits, i)) > + { > + abs_pages[ABS_to_HID_map[i][0]][0]++; > + abs_pages[ABS_to_HID_map[i][0]][abs_pages[ABS_to_HID_map[i][0]][0]] = i; > + > + ioctl(ext->base.device_fd, EVIOCGABS(i), &(ext->abs_map[i])); > + if (abs_pages[ABS_to_HID_map[i][0]][0] == 1) > + { > + descript_size += sizeof(report_axis_header); > + descript_size += sizeof(report_abs_axis_tail); > + } > + } > + /* Skip page 0, aka HID_USAGE_PAGE_UNDEFINED */ > + for (i = 1; i < TOP_ABS_PAGE; i++) > + if (abs_pages[i][0] > 0) > + { > + int j; > + descript_size += sizeof(report_axis_usage) * abs_pages[i][0]; > + for (j = 1; j <= abs_pages[i][0]; j++) > + { > + ext->abs_map[abs_pages[i][j]].report_index = report_size; > + report_size+=2; > + } > + abs_count++; > + } > + > + rel_count = 0; > + memset(rel_pages, 0, sizeof(rel_pages)); > + for (i = 0; i < HID_REL_MAX; i++) > + if (test_bit(relbits, i)) > + { > + rel_pages[REL_to_HID_map[i][0]][0]++; > + rel_pages[REL_to_HID_map[i][0]][rel_pages[REL_to_HID_map[i][0]][0]] = i; > + if (rel_pages[REL_to_HID_map[i][0]][0] == 1) > + { > + descript_size += sizeof(report_axis_header); > + descript_size += sizeof(report_rel_axis_tail); > + } > + } > + /* Skip page 0, aka HID_USAGE_PAGE_UNDEFINED */ > + for (i = 1; i < TOP_REL_PAGE; i++) > + if (rel_pages[i][0] > 0) > + { > + int j; > + descript_size += sizeof(report_axis_usage) * rel_pages[i][0]; > + for (j = 1; j <= rel_pages[i][0]; j++) > + { > + ext->rel_map[rel_pages[i][j]] = report_size; > + report_size++; > + } > + rel_count++; > + } > + > + hat_count = 0; > + for (i = ABS_HAT0X; i <=ABS_HAT3X; i+=2) > + if (test_bit(absbits, i)) > + { > + ext->hat_map[i - ABS_HAT0X] = report_size; > + ext->hat_values[i - ABS_HAT0X] = 0; > + ext->hat_values[i - ABS_HAT0X + 1] = 0; > + report_size++; > + hat_count++; > + } > + > + TRACE("Report Descriptor will be %i bytes\n", descript_size); > + TRACE("Report will be %i bytes\n", report_size); > + > + ext->report_descriptor = HeapAlloc(GetProcessHeap(), 0, descript_size); > + report_ptr = ext->report_descriptor; > + > + memcpy(report_ptr, report_header, sizeof(report_header)); > + report_ptr[IDX_HEADER_PAGE] = device_usage[0]; > + report_ptr[IDX_HEADER_USAGE] = device_usage[1]; > + report_ptr += sizeof(report_header); > + if (button_count) > + { > + report_ptr = add_button_block(report_ptr, 1, button_count); > + if (button_count % 8) > + { > + BYTE padding = 8 - (button_count % 8); > + report_ptr = add_padding_block(report_ptr, padding); > + } > + } > + if (abs_count) > + { > + for (i = 1; i < TOP_ABS_PAGE; i++) > + { > + if (abs_pages[i][0]) > + { > + BYTE usages[HID_ABS_MAX]; > + int j; > + for (j = 0; j < abs_pages[i][0]; j++) > + usages[j] = ABS_to_HID_map[abs_pages[i][j+1]][1]; > + report_ptr = add_axis_block(report_ptr, abs_pages[i][0], i, usages, TRUE); > + } > + } > + } > + if (rel_count) > + { > + for (i = 1; i < TOP_REL_PAGE; i++) > + { > + if (rel_pages[i][0]) > + { > + BYTE usages[HID_REL_MAX]; > + int j; > + for (j = 0; j < rel_pages[i][0]; j++) > + usages[j] = REL_to_HID_map[rel_pages[i][j+1]][1]; > + report_ptr = add_axis_block(report_ptr, rel_pages[i][0], i, usages, FALSE); > + } > + } > + } > + if (hat_count) > + report_ptr = add_hatswitch(report_ptr, hat_count); > + > + memcpy(report_ptr, report_tail, sizeof(report_tail)); > + > + ext->report_descriptor_size = descript_size; > +} > +#endif > + > static inline WCHAR *strdupAtoW(const char *src) > { > WCHAR *dst; > @@ -406,9 +822,23 @@ static const platform_vtbl hidraw_vtbl = > > #ifdef HAS_PROPER_INPUT_HEADER > > +static inline struct wine_input_private *input_impl_from_DEVICE_OBJECT(DEVICE_OBJECT *device) > +{ > + return (struct wine_input_private*)get_platform_private(device); > +} > + > static NTSTATUS lnxev_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length) > { > - return STATUS_NOT_IMPLEMENTED; > + struct wine_input_private *ext = input_impl_from_DEVICE_OBJECT(device); > + > + *out_length = ext->report_descriptor_size; > + > + if (length < ext->report_descriptor_size) > + return STATUS_BUFFER_TOO_SMALL; > + > + memcpy(buffer, ext->report_descriptor, ext->report_descriptor_size); > + > + return STATUS_SUCCESS; > } > > static NTSTATUS lnxev_get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length) > @@ -511,7 +941,7 @@ static void try_add_device(struct udev_device *dev) > #ifdef HAS_PROPER_INPUT_HEADER > else if (strcmp(subsystem, "input") == 0) > { > - device = bus_create_hid_device(udev_driver_obj, lnxev_busidW, vid, pid, version, 0, serial, (gamepad != NULL), &GUID_DEVCLASS_LINUXEVENT, &lnxev_vtbl, sizeof(struct platform_private)); > + device = bus_create_hid_device(udev_driver_obj, lnxev_busidW, vid, pid, version, 0, serial, (gamepad != NULL), &GUID_DEVCLASS_LINUXEVENT, &lnxev_vtbl, sizeof(struct wine_input_private)); > } > #endif > > @@ -520,6 +950,9 @@ static void try_add_device(struct udev_device *dev) > struct platform_private *private = impl_from_DEVICE_OBJECT(device); > private->udev_device = udev_device_ref(dev); > private->device_fd = fd; > +#ifdef HAS_PROPER_INPUT_HEADER > + build_report_descriptor((struct wine_input_private*)private, dev); I don't think you want this code to be executed for hidraw devices. > +#endif > IoInvalidateDeviceRelations(device, BusRelations); > } > else > > >

1 0

Re: [PATCH v2 2/2] wined3d: Add quirk for Nvidia viewport subpixel bits bug.
by Sebastian Lackner 27 Feb '17

27 Feb '17

On 27.02.2017 13:42, Józef Kucia wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > > Version 2: Test if the pixel center offset works as expected. > > Tested with nouveau, radeonsi and Nvidia blob. > wined3d_caps_gl_ctx_test_viewport_subpixel_bits() fails only with Nvidia blob. As you might be aware, the problem on Nvidia binary can also be worked around by using slightly different offsets (basically reverting 1bed10abee7d2439a5c7358596c860c454f06b53). Do you think its better to disable it, or should we just use different pixel center offsets? > > --- > dlls/wined3d/directx.c | 27 ++++++++++++++++++++++++ > dlls/wined3d/utils.c | 47 ++++++++++++++++++++++++++++++++++++++++++ > dlls/wined3d/wined3d_private.h | 2 ++ > 3 files changed, 76 insertions(+) > > diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c > index 7f1a850..3495710 100644 > --- a/dlls/wined3d/directx.c > +++ b/dlls/wined3d/directx.c > @@ -913,6 +913,17 @@ static BOOL match_broken_arb_fog(const struct wined3d_gl_info *gl_info, struct w > return data[0] != 0x00ff0000 || data[3] != 0x0000ff00; > } > > +static BOOL match_broken_viewport_subpixel_bits(const struct wined3d_gl_info *gl_info, > + struct wined3d_caps_gl_ctx *ctx, const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, > + enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) > +{ > + if (!gl_info->supported[ARB_VIEWPORT_ARRAY]) > + return FALSE; > + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) > + return FALSE; > + return !wined3d_caps_gl_ctx_test_viewport_subpixel_bits(ctx); > +} > + > static void quirk_apple_glsl_constants(struct wined3d_gl_info *gl_info) > { > /* MacOS needs uniforms for relative addressing offsets. This can accumulate to quite a few uniforms. > @@ -1041,6 +1052,17 @@ static void quirk_broken_arb_fog(struct wined3d_gl_info *gl_info) > gl_info->quirks |= WINED3D_QUIRK_BROKEN_ARB_FOG; > } > > +static void quirk_broken_viewport_subpixel_bits(struct wined3d_gl_info *gl_info) > +{ > + TRACE("Disabling ARB_viewport_array.\n"); > + gl_info->supported[ARB_VIEWPORT_ARRAY] = FALSE; > + if (gl_info->supported[ARB_CLIP_CONTROL]) > + { > + TRACE("Disabling ARB_clip_control.\n"); > + gl_info->supported[ARB_CLIP_CONTROL] = FALSE; > + } > +} > + > struct driver_quirk > { > BOOL (*match)(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, > @@ -1132,6 +1154,11 @@ static const struct driver_quirk quirk_table[] = > quirk_broken_arb_fog, > "ARBfp fogstart == fogend workaround" > }, > + { > + match_broken_viewport_subpixel_bits, > + quirk_broken_viewport_subpixel_bits, > + "Nvidia viewport subpixel bits bug" > + }, > }; > > /* Certain applications (Steam) complain if we report an outdated driver version. In general, > diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c > index b076783..c392388 100644 > --- a/dlls/wined3d/utils.c > +++ b/dlls/wined3d/utils.c > @@ -3509,6 +3509,53 @@ fail: > return FALSE; > } > > +BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx *ctx) > +{ > + static const struct wined3d_color red = {1.0f, 0.0f, 0.0f, 1.0f}; > + const struct wined3d_gl_info *gl_info = ctx->gl_info; > + static const float offset = -63.0f / 128.0f; > + GLuint texture, fbo; > + DWORD readback[4]; > + unsigned int i; > + > + gl_info->gl_ops.gl.p_glGenTextures(1, &texture); > + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, texture); > + gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); > + gl_info->gl_ops.gl.p_glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, ARRAY_SIZE(readback), 1, 0, > + GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL); > + gl_info->fbo_ops.glGenFramebuffers(1, &fbo); > + gl_info->fbo_ops.glBindFramebuffer(GL_FRAMEBUFFER, fbo); > + gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, > + GL_TEXTURE_2D, texture, 0); > + checkGLcall("create resources"); > + > + gl_info->gl_ops.gl.p_glClearColor(1.0f, 1.0f, 1.0f, 1.0f); > + gl_info->gl_ops.gl.p_glClear(GL_COLOR_BUFFER_BIT); > + GL_EXTCALL(glViewportIndexedf(0, offset, offset, 4.0f, 1.0f)); > + draw_test_quad(ctx, NULL, &red); > + checkGLcall("draw"); > + > + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, texture); > + gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_2D, 0, > + GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, readback); > + checkGLcall("readback"); > + > + TRACE("Readback colors are 0x%08x, 0x%08x, 0x%08x, 0x%08x.\n", > + readback[0], readback[1], readback[2], readback[3]); > + > + gl_info->gl_ops.gl.p_glDeleteTextures(1, &texture); > + gl_info->fbo_ops.glDeleteFramebuffers(1, &fbo); > + gl_info->fbo_ops.glBindFramebuffer(GL_FRAMEBUFFER, 0); > + checkGLcall("delete resources"); > + > + for (i = 0; i < ARRAY_SIZE(readback); ++i) > + { > + if (readback[i] != 0xffff0000) > + return FALSE; > + } > + return TRUE; > +} > + > float wined3d_adapter_find_polyoffset_scale(struct wined3d_caps_gl_ctx *ctx, GLenum format) > { > const struct wined3d_gl_info *gl_info = ctx->gl_info; > diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h > index 7950011..3cd7ae5 100644 > --- a/dlls/wined3d/wined3d_private.h > +++ b/dlls/wined3d/wined3d_private.h > @@ -2354,6 +2354,8 @@ BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, > struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; > UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) DECLSPEC_HIDDEN; > > +BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; > + > void install_gl_compat_wrapper(struct wined3d_gl_info *gl_info, enum wined3d_gl_extension ext) DECLSPEC_HIDDEN; > > enum projection_types >

2 3

Re: winmm: Fix some spec file entries
by Andrew Eikum 27 Feb '17

27 Feb '17

On Wed, Feb 22, 2017 at 11:23:08PM +0100, André Hentschel wrote: > -@ stdcall PlaySound(ptr long long) PlaySoundA > -@ stdcall PlaySoundA(ptr long long) > -@ stdcall PlaySoundW(ptr long long) > +@ stdcall PlaySound(str long long) PlaySoundA > +@ stdcall PlaySoundA(str long long) > +@ stdcall PlaySoundW(wstr long long) The first parameter is not always a string, sometimes it's a resource identifier or even a raw pointer: https://msdn.microsoft.com/en-us/library/windows/desktop/dd743679(v=vs.85).… Andrew

1 0

Re: [PATCH] oledb32: Correct length calculation in DataConvert for DBTYPE_STR
by Huw Davies 27 Feb '17

27 Feb '17

On Fri, Feb 24, 2017 at 06:45:16AM +0000, Alistair Leslie-Hughes wrote: > v2 - Correct failing test under wine > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/oledb32/convert.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c > index ac462f2..20ef917 100644 > --- a/dlls/oledb32/convert.c > +++ b/dlls/oledb32/convert.c > @@ -816,23 +816,23 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, > case DBTYPE_STR: > { > BSTR b; > - DBLENGTH bstr_len; > + DBLENGTH length; > INT bytes_to_copy; > - hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &bstr_len, > + hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &length, > src, &b, sizeof(BSTR), src_status, dst_status, > precision, scale, flags); > if(hr != S_OK) return hr; > - bstr_len = SysStringLen(b); > - *dst_len = bstr_len * sizeof(char); /* Doesn't include size for '\0' */ > + length = WideCharToMultiByte(CP_ACP, 0, b, -1, NULL, 0, NULL, NULL); > + *dst_len = SysStringLen(b); /* Doesn't include size for '\0' */ This obviously can't be right. As I said, you want to pass SysStringLen(b) as the wstr_len to WideCharToMultiByte(). Then whatever that returns will be the length of the ansi string excluding the '\0'. That should go into *dst_len. > *dst_status = DBSTATUS_S_OK; > - bytes_to_copy = min(*dst_len + sizeof(char), dst_max_len); > + bytes_to_copy = min(length, dst_max_len); bytes_to_copy should be min(length + 1, dst_max_len), so unchanged, but let's get rid of sizeof(char). > if(dst) > { > if(bytes_to_copy >= sizeof(char)) > { > - WideCharToMultiByte(CP_ACP, 0, b, bytes_to_copy - sizeof(char), dst, dst_max_len, NULL, NULL); > + WideCharToMultiByte(CP_ACP, 0, b, -1, dst, dst_max_len, NULL, NULL); Again SysStringLen(b) here for the wstr_len. > *((char *)dst + bytes_to_copy / sizeof(char) - 1) = 0; This is correct, but again let's get rid of the sizeof(char). > - if(bytes_to_copy < *dst_len + sizeof(char)) > + if(bytes_to_copy < length) should be length + 1. You probably want to add a test for a STR -> STR conversion of "test\0ed" and pass in interesting src lengths like 6, 7 and 8, then check the returned dst (using memcmp, not strcmp). Huw.

1 0

Re: iphlpapi/tests: Don't skip because of an obsolete function
by Nikolay Sivov 27 Feb '17

27 Feb '17

On 27.02.2017 16:05, André Hentschel wrote: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > dlls/iphlpapi/tests/iphlpapi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c > index 953bbc9..ddea4f8 100644 > --- a/dlls/iphlpapi/tests/iphlpapi.c > +++ b/dlls/iphlpapi/tests/iphlpapi.c > @@ -1583,7 +1583,7 @@ static void test_AllocateAndGetTcpExTableFromStack(void) > > if (!pAllocateAndGetTcpExTableFromStack) > { > - skip("AllocateAndGetTcpExTableFromStack not available\n"); > + trace("AllocateAndGetTcpExTableFromStack not available, skipping\n"); > return; > } > > What's a point of this change?

1 0

Re: ntdll: Fix RtlExpandEnvironmentStrings_U spec file entry (try 2)
by Alexandre Julliard 27 Feb '17

27 Feb '17

André Hentschel <nerv(a)dawncrow.de> writes: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > dlls/ntdll/ntdll.spec | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > > diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec > index 66618fc..7d7c34b 100644 > --- a/dlls/ntdll/ntdll.spec > +++ b/dlls/ntdll/ntdll.spec > @@ -589,7 +589,7 @@ > @ stdcall RtlEraseUnicodeString(ptr) > @ stdcall RtlExitUserProcess(long) > @ stdcall RtlExitUserThread(long) > -@ stdcall RtlExpandEnvironmentStrings_U(ptr ptr ptr ptr) > +@ stdcall RtlExpandEnvironmentStrings_U(wstr ptr ptr ptr) That's not a string either. -- Alexandre Julliard julliard(a)winehq.org

1 0

Coverity reports for test suite
by Alex Henrie 27 Feb '17

27 Feb '17

Hello, I recently noticed that we don't currently get Coverity reports for files in the test suite. I emailed Amine Khaldi, who does the Coverity reports, and asked if we could start getting reports on the tests. Amine made it sound like this had been discussed before and due to the large volume of reports, there was not interest in getting reports for anything other than the actual Wine code. Is there enough interest now to start looking at the test suite reports? Would it hurt anything to be able to see that information? -Alex

6 10

Re: [PATCH] wined3d: Add quirk for Nvidia viewport subpixel bits bug.
by Henri Verbeet 27 Feb '17

27 Feb '17

On 26 February 2017 at 19:55, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +static BOOL match_nvidia_viewport_subpixel_bits(const struct wined3d_gl_info *gl_info, const char *gl_renderer, > + enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) > +{ > + return gl_vendor == GL_VENDOR_NVIDIA && gl_info->supported[ARB_VIEWPORT_ARRAY]; > +} If reasonably possible, we'd like to avoid matching on gl_vendor and the like. It's not the most reliable information we have, and would prevent the feature from working in the future if the driver is ever fixed. I'll grant the chances aren't great on the latter, but out of principle, it should be possible to test if the feature itself is working.

1 0

Re: iphlpapi/tests: Fix test failure for ScopeID with bad DAD
by Bruno Jesus 27 Feb '17

27 Feb '17

On Wed, Feb 22, 2017 at 5:01 PM, André Hentschel <nerv(a)dawncrow.de> wrote: > diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c > index e0701a3..2f818ff 100644 > --- a/dlls/iphlpapi/tests/iphlpapi.c > +++ b/dlls/iphlpapi/tests/iphlpapi.c > @@ -2067,6 +2067,9 @@ static void test_GetUnicastIpAddressEntry(void) > if (row.Address.si_family == AF_INET6) > ok(row.ScopeId.Value == row.Address.Ipv6.sin6_scope_id, "Expected %d, got %d\n", > row.Address.Ipv6.sin6_scope_id, row.ScopeId.Value); > + else if (row.DadState == IpDadStateTentative) > + ok(row.ScopeId.Value == aa->IfIndex, "Expected %d, got %d\n", > + aa->IfIndex, row.ScopeId.Value); > else > ok(row.ScopeId.Value == 0, "Expected 0, got %d\n", row.ScopeId.Value); > ok(row.CreationTimeStamp.QuadPart, "CreationTimeStamp is 0\n"); It may be bikeshedding but 2 things call my attention. The first is that ScopeID is a IPv6 only field, it is very weird that Windows is using it for something. The second is that it may be by chance that ScopeID matches the interface index, tentative means that the DAD mechanism is still working into checking the IP in the network, so ScopeID in such case would be meaningless until it turns into IpDadStatePreferred or maybe one of the other error states.

2 2

Proposal: winetest 'context'
by Mark Jansen 26 Feb '17

26 Feb '17

Hello, Often when testing something, helper functions are introduced that are called with different data (for example when iterating over tables). Attached patch (winetest_set_context.diff) is a proposal that allows tests to specify a 'context', that will be printed in the failure message. This way, the actual test code does not have to prefix every case with a trace, or include the data in every test macro. The patch is written so that tests do not have to use this mechanism, so there is no need to convert all tests at once. Second attachment (winetest_ctx_example.diff) shows how an existing test could be converted to use this new technique. Regards, Mark Jansen

3 2

Re: [PATCH] rasapi32: Ensure device count matches data returned
by Sebastian Lackner 26 Feb '17

26 Feb '17

On 26.02.2017 20:41, Bruno Jesus wrote: > From: Bruno Jesus <bjesus(a)codeweavers.com> > > Based on original patch by Qian Hong. > > Fixes bug https://bugs.winehq.org/show_bug.cgi?id=30378 > > Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> > --- > dlls/rasapi32/rasapi.c | 1 + > dlls/rasapi32/tests/rasapi.c | 24 ++++++++++++++++++++++++ > 2 files changed, 25 insertions(+) > > diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c > index fcd0cb8..f97d4c1 100644 > --- a/dlls/rasapi32/rasapi.c > +++ b/dlls/rasapi32/rasapi.c > @@ -254,6 +254,7 @@ DWORD WINAPI RasEnumDevicesA(LPRASDEVINFOA lpRasDevinfo, LPDWORD lpcb, LPDWORD l > if(lpRasDevinfo && lpRasDevinfo->dwSize != sizeof(RASDEVINFOA)) > return ERROR_INVALID_SIZE; > > + *lpcDevices = 1; > if (!lpRasDevinfo || (*lpcb < sizeof(RASDEVINFOA))) { > *lpcb = sizeof(RASDEVINFOA); > return ERROR_BUFFER_TOO_SMALL; > diff --git a/dlls/rasapi32/tests/rasapi.c b/dlls/rasapi32/tests/rasapi.c > index e0ff25f..e982f6c 100644 > --- a/dlls/rasapi32/tests/rasapi.c > +++ b/dlls/rasapi32/tests/rasapi.c > @@ -77,80 +77,104 @@ static void test_rasenum(void) > > /* test first parameter */ > cb = bufsize; > + cDevices = 0xdead; > result = pRasEnumDevicesA(NULL, &cb, &cDevices); > ok(result == ERROR_BUFFER_TOO_SMALL || > result == ERROR_INVALID_USER_BUFFER, /* win98 */ > "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); > + ok(cDevices > 0 && cDevices != 0xdead, "Unexpected device count %d\n", cDevices); > > rasDevInfo[0].dwSize = 0; > cb = bufsize; > + cDevices = 0xdead; > result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); > ok(result == ERROR_INVALID_SIZE || > result == ERROR_INVALID_USER_BUFFER, /* win98 */ > "Expected ERROR_INVALID_SIZE, got %08d\n", result); > + ok(cDevices == 0xdead, "Unexpected device count %d\n", cDevices); > > rasDevInfo[0].dwSize = sizeof(RASDEVINFOA) -1; > cb = bufsize; > + cDevices = 0xdead; > result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); > ok(result == ERROR_INVALID_SIZE || > result == ERROR_INVALID_USER_BUFFER, /* win98 */ > "Expected ERROR_INVALID_SIZE, got %08d\n", result); > + ok(cDevices == 0xdead, "Unexpected device count %d\n", cDevices); > > rasDevInfo[0].dwSize = sizeof(RASDEVINFOA) +1; > cb = bufsize; > + cDevices = 0xdead; > result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); > ok(result == ERROR_INVALID_SIZE || > result == ERROR_INVALID_USER_BUFFER, /* win98 */ > "Expected ERROR_INVALID_SIZE, got %08d\n", result); > + ok(cDevices == 0xdead, "Unexpected device count %d\n", cDevices); > > /* test second parameter */ > rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); > result = pRasEnumDevicesA(rasDevInfo, NULL, &cDevices); > + cDevices = 0xdead; Whats the point to set this after the function call? And also, how is this better than Qian Hongs original patch? Using %u is more correct for unsigned values, and the empty line after the assignment of *lpcDevices also didn't hurt. > ok(result == ERROR_INVALID_PARAMETER, > "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); > + ok(cDevices == 0xdead, "Unexpected device count %d\n", cDevices); > > rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); > cb = 0; > result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); > + cDevices = 0xdead; > ok(result == ERROR_BUFFER_TOO_SMALL || > result == ERROR_INVALID_SIZE, /* vista, 2k8 */ > "Expected ERROR_BUFFER_TOO_SMALL/ERROR_INVALID_SIZE, got %08d\n", result); > + ok(cDevices == 0xdead, "Unexpected device count %d\n", cDevices); > > rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); > cb = bufsize -1; > result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); > + cDevices = 0xdead; > ok(result == ERROR_BUFFER_TOO_SMALL, > "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); > + ok(cDevices == 0xdead, "Unexpected device count %d\n", cDevices); > > rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); > cb = bufsize +1; > + cDevices = 0xdead; > result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); > ok(result == ERROR_SUCCESS, > "Expected ERROR_SUCCESS, got %08d\n", result); > + ok(cDevices > 0 && cDevices != 0xdead, "Unexpected device count %d\n", cDevices); > > /* test third parameter */ > rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); > cb = bufsize; > + cDevices = 0xdead; > result = pRasEnumDevicesA(rasDevInfo, &cb, NULL); > ok(result == ERROR_INVALID_PARAMETER, > "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); > + ok(cDevices == 0xdead, "Unexpected device count %d\n", cDevices); > > /* test combinations of invalid parameters */ > + cDevices = 0xdead; > result = pRasEnumDevicesA(NULL, NULL, &cDevices); > ok(result == ERROR_INVALID_PARAMETER, > "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); > + ok(cDevices == 0xdead, "Unexpected device count %d\n", cDevices); > > + cDevices = 0xdead; > result = pRasEnumDevicesA(NULL, &cb, NULL); > ok(result == ERROR_INVALID_PARAMETER || > result == ERROR_INVALID_USER_BUFFER, /* win98 */ > "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); > + ok(cDevices == 0xdead, "Unexpected device count %d\n", cDevices); > > cb = 0; > rasDevInfo[0].dwSize = 0; > + cDevices = 0xdead; > result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); > ok(result == ERROR_INVALID_SIZE || > broken(result == ERROR_BUFFER_TOO_SMALL), /* win98 */ > "Expected ERROR_INVALID_SIZE, got %08d\n", result); > + ok(cDevices == 0xdead, "Unexpected device count %d\n", cDevices); > > HeapFree(GetProcessHeap(), 0, rasDevInfo); > } > -- 2.9.3 >

2 1

Re: include: Avoid overflow (warning) in RGBA_MAKE.
by Dmitry Timoshkov 26 Feb '17

26 Feb '17

Gerald Pfeifer <gerald(a)pfeifer.com> wrote: > --- a/include/d3dtypes.h > +++ b/include/d3dtypes.h > @@ -53,7 +53,7 @@ typedef LONG D3DFIXED; > #define RGBA_GETRED(rgb) (((rgb) >> 16) & 0xff) > #define RGBA_GETGREEN(rgb) (((rgb) >> 8) & 0xff) > #define RGBA_GETBLUE(rgb) ((rgb) & 0xff) > -#define RGBA_MAKE(r, g, b, a) ((D3DCOLOR) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))) > +#define RGBA_MAKE(r, g, b, a) ((D3DCOLOR) (((unsigned)(a) << 24) | ((r) << 16) | ((g) << 8) | (b))) This is a public header, probably you need to fix the callers of this macro instead. -- Dmitry.

3 4

Re: [PATCH 03/18] comctl32: Added basic implementation for task dialogs and add tests
by Fabian Maurer 26 Feb '17

26 Feb '17

Thanks for the reply, > If this will stay, please use functions, not macros. STR_SIZE does not > look useful. Well, I figured it makes the code a bit easier. Should I should just write it out everywhere or make it a function? > Usually there's no need to allocate 'struct list' itself. You're right, I'll rewrite that. > You can't free list node like that. What do you mean? I allocated the list and it's contents with HeapAlloc, so I need to free it that way. Or am I missing something? > This one is already defined in a header. Thanks, I'll use the headers instead of adding another define for that. > Static string for that doesn't look right. Why is that? I've looked into the other code, and strings are often defined as static const WCHAR, that was the recommended method, too. Of course that needs to be changed later, since we (probably) want to take localization into account. Regards, Fabian Maurer

3 4

Re: [PATCH 04/18] comctl32: Extend TaskDialog, add simple callback and tests
by Nikolay Sivov 26 Feb '17

26 Feb '17

On 25.02.2017 19:01, Fabian Maurer wrote: > +/* FIXME: Make thread safe? */ > +static const TASKDIALOGCONFIG *task_config = 0; > +static HRESULT callback(HWND hwnd, UINT uNotification, WPARAM wParam, LPARAM lParam) > +{ > + if(task_config->pfCallback) > + return task_config->pfCallback(hwnd, uNotification, wParam, lParam, task_config->lpCallbackData); > + return S_OK; > +} > + > static INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) > { > + HRESULT ret_callback; > + > switch (uMsg) > { > + case WM_INITDIALOG: > + callback(hwndDlg, TDN_DIALOG_CONSTRUCTED, 0, 0); > + callback(hwndDlg, TDN_CREATED, 0, 0); > + return TRUE; How is this going to work with global variable? > +/* For message checking we use a simplified version from the code used for user32 messages */ > + > +#define TDN_NO_MORE_MESSAGES 0xffffffff > + > +typedef struct > +{ > + UINT msg; > + WPARAM wparam; > + LPARAM lparam; > + > + struct list entry; > +}message_data; > + > +static struct list messages = LIST_INIT(messages); > + > +/* Message lists to test against */ > + > +static const message_data mes_simple_show[] = { > + { TDN_DIALOG_CONSTRUCTED, 0, 0 }, > + { TDN_CREATED, 0, 0 }, > + { TDN_BUTTON_CLICKED, IDOK, 0 }, > + { TDN_DESTROYED, 0, 0 }, > + { TDN_NO_MORE_MESSAGES } > +}; > + > +/* Functions handling message processing */ > + > +static void message_add(UINT msg, WPARAM wparam, LPARAM lparam) > +{ > + message_data *data = HeapAlloc(GetProcessHeap(), 0, sizeof(message_data)); > + > + data->msg = msg; > + data->wparam = wparam; > + data->lparam = lparam; > + > + list_add_tail(&messages, &data->entry); > +} > + > +#define ok_sequence(exp ) \ > + ok_sequence_((exp), __FILE__, __LINE__) > + > +static void ok_sequence_(const message_data *expected_list, const char *file, int line) > +{ > + message_data *message; > + BOOL dump = FALSE; > + UINT count; > + For that please use msg.h from comctl32/tests.

2 3

Re: [PATCH 06/18] comctl32: TaskDialog - Implement main and content text controls
by Nikolay Sivov 26 Feb '17

26 Feb '17

On 25.02.2017 19:01, Fabian Maurer wrote: > + PostMessageW(GetDlgItem(hwndDlg, ID_TEXTMAIN), WM_SETFONT, (WPARAM)font_main, TRUE); > + PostMessageW(GetDlgItem(hwndDlg, ID_TEXTCONTENT), WM_SETFONT, (WPARAM)font_default, TRUE); Why Post*? Dialog handling in user32 has an ability to do this for you. > + case WM_CTLCOLORSTATIC: > + if((HWND)lParam == GetDlgItem(hwndDlg, ID_TEXTMAIN)) > + { > + HDC hdc = (HDC) wParam; > + > + SetTextColor(hdc, RGB(50,50,220)); > + SetBkColor(hdc, GetSysColor(COLOR_3DFACE)); > + > + return (INT_PTR)GetSysColorBrush(COLOR_3DFACE); > + } > + break; Where does this come from? > + font_default = CreateFontW (16, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, > + DEFAULT_CHARSET, 0, 0, CLEARTYPE_QUALITY, FF_DONTCARE, font_name); > + font_main = CreateFontW (19, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, > + DEFAULT_CHARSET, 0, 0, CLEARTYPE_QUALITY, FF_DONTCARE, font_name); > + Why Tahoma is hardcoded? If you're using dialog code this should be handled automatically using template data. > + if(!IS_INTRESOURCE(pTaskConfig->pszMainInstruction) && !STR_EMPTY(pTaskConfig->pszMainInstruction)) > + { > + RECT rect; > + > + SelectObject(dc_dummy, font_main); > + rect = text_get_rect(dc_dummy, pTaskConfig->pszMainInstruction, dialog_width); > + > + controls_add(controls, ID_TEXTMAIN, class_static, pTaskConfig->pszMainInstruction, > + WS_CHILD | WS_VISIBLE, 5, dialog_height + 5, rect.right, rect.bottom); > + > + dialog_height += rect.bottom + 10; > + SelectObject(dc_dummy, font_default); > + } > + > + if(!IS_INTRESOURCE(pTaskConfig->pszContent) && !STR_EMPTY(pTaskConfig->pszContent)) > + { > + RECT rect = text_get_rect(dc_dummy, pTaskConfig->pszContent, dialog_width); > + > + controls_add(controls, ID_TEXTCONTENT, class_static, pTaskConfig->pszContent, > + WS_CHILD | WS_VISIBLE, 5, dialog_height + 5, rect.right, rect.bottom); > + > + dialog_height += rect.bottom + 10; > + } > + > + controls_add(controls, IDOK, class_button, text_ok, > + WS_CHILD | WS_VISIBLE | BS_DEFPUSHBUTTON, dialog_width - 40 - 10, dialog_height + 5, 40, 10); > + dialog_height += 10 + 10; There's a lot of magic offsets here that should be grouped together and probably have some defined names too.

2 3

Re: [PATCH v2 4/6] ddraw: Keep a ddraw object reference in d3d7 vertex buffers.
by Henri Verbeet 26 Feb '17

26 Feb '17

On 24 February 2017 at 19:37, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -4257,6 +4257,7 @@ static HRESULT WINAPI d3d7_CreateVertexBuffer(IDirect3D7 *iface, D3DVERTEXBUFFER > { > TRACE("Created vertex buffer %p.\n", object); > *vertex_buffer = &object->IDirect3DVertexBuffer7_iface; > + IDirectDraw7_AddRef(&ddraw->IDirectDraw7_iface); > } It seems more appropriate to do this in d3d_vertex_buffer_create() when storing the ddraw pointer.

1 0

Re: [PATCH 14/18] comctl32: TaskDialog - Changed tests to make them more reliable
by Marvin 25 Feb '17

25 Feb '17

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=28901 Your paranoid android. === w7pro64 (64 bit taskdialog) === 0824:taskdialog: unhandled exception c0000005 at 00000000004620FE

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