- wine-devel - winehq.org

Re: [v4 2/3] ntdll: Implement FileIdInformation class support in NtQueryInformationFile (resend).
by Sebastian Lackner 10 Feb '17

10 Feb '17

On 07.02.2017 16:11, Jonathan Doron wrote: > Signed-off-by: Jonathan Doron <jond(a)wizery.com> > --- > configure.ac | 2 +- > dlls/ntdll/file.c | 28 ++++++++++++++++++++++- > dlls/ntdll/tests/file.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ > include/winternl.h | 9 ++++++++ > 4 files changed, 97 insertions(+), 2 deletions(-) > > diff --git a/configure.ac b/configure.ac > index c6d63b2..f66bf44 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -2262,7 +2262,7 @@ fi > dnl **** FIXME: what about mixed cases, where we need two of them? *** > > dnl Check for statfs members > -AC_CHECK_MEMBERS([struct statfs.f_bfree, struct statfs.f_bavail, struct statfs.f_frsize, struct statfs.f_ffree, struct statfs.f_favail, struct statfs.f_namelen],,, > +AC_CHECK_MEMBERS([struct statfs.f_bfree, struct statfs.f_bavail, struct statfs.f_frsize, struct statfs.f_ffree, struct statfs.f_favail, struct statfs.f_namelen, struct statfs.f_fsid.__val],,, > [#include <sys/types.h> > #ifdef HAVE_SYS_PARAM_H > # include <sys/param.h> > diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c > index a6c1098..c6ff371 100644 > --- a/dlls/ntdll/file.c > +++ b/dlls/ntdll/file.c > @@ -2377,7 +2377,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, > 0, /* FileRenameInformationBypassAccessCheck */ > 0, /* FileLinkInformationBypassAccessCheck */ > 0, /* FileVolumeNameInformation */ > - 0, /* FileIdInformation */ > + sizeof(FILE_ID_INFORMATION), /* FileIdInformation */ > 0, /* FileIdExtdDirectoryInformation */ > 0, /* FileReplaceCompletionInformation */ > 0, /* FileHardLinkFullIdInformation */ > @@ -2619,6 +2619,32 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, > } > } > break; > + case FileIdInformation: > + { > + FILE_ID_INFORMATION *info = ptr; > + memset(info, 0, sizeof(*info)); > + if (fstat(fd, &st) == -1) > + { > + io->u.Status = FILE_GetNtStatus(); > + } > + else > + { > +#if defined(linux) && defined(HAVE_FSTATFS) && defined(HAVE_STRUCT_STATFS_F_FSID___VAL) > + struct statfs volstats; > + if (fstatfs(fd, &volstats) == -1) > + { > + io->u.Status = FILE_GetNtStatus(); > + break; > + } > + > + memcpy(&info->VolumeSerialNumber, > + &volstats.f_fsid.__val, > + min(sizeof(info->VolumeSerialNumber), sizeof(volstats.f_fsid.__val))); I didn't think about this earlier, but if you are planning to use memcpy anyway, wouldn't it be easier to just copy f_fsid directly, instead of f_fsid.__val? When you do not make any assumptions about f_fsid it would work on all platforms. > +#endif > + ((LARGE_INTEGER *)&info->FileId)->QuadPart = st.st_ino; > + } > + } > + break; > default: > FIXME("Unsupported class (%d)\n", class); > io->u.Status = STATUS_NOT_IMPLEMENTED; > diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c > index 57d7df9..00856ab 100644 > --- a/dlls/ntdll/tests/file.c > +++ b/dlls/ntdll/tests/file.c > @@ -1444,6 +1444,65 @@ static void test_file_basic_information(void) > CloseHandle( h ); > } > > +static void test_file_id_information(void) > +{ > + IO_STATUS_BLOCK io; > + FILE_ID_INFORMATION fid1, fid2; > + HANDLE h = INVALID_HANDLE_VALUE; > + NTSTATUS res; > + char path[MAX_PATH], buffer[MAX_PATH]; > + > + /* Generate a temp file name */ Not all of these steps need an explanation, so you could remove some of the comments for things which are obvious. > + GetTempPathA(MAX_PATH, path); > + GetTempFileNameA(path, "foo", 0, buffer); > + > + /* Create the temp file */ > + h = CreateFileA(buffer, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); > + ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); > + > + /* Query the temp file unique id */ > + memset(&fid1, 0, sizeof(fid1)); > + res = pNtQueryInformationFile(h, &io, &fid1, sizeof fid1, FileIdInformation); Here you are mixing two styles for sizeof, one with "()" and one without. The same also applies to a couple of other places below. > + if ((res == STATUS_NOT_IMPLEMENTED) || (res == STATUS_INVALID_INFO_CLASS)) The extra "()" is not really necessary. > + { > + CloseHandle(h); > + DeleteFileA(buffer); > + win_skip("FileIdInformation not supported\n"); > + return; > + } > + > + ok(res == STATUS_SUCCESS, "can't get fid1, res %x\n", res); > + > + CloseHandle(h); > + > + /* Open the file again */ > + h = CreateFileA(buffer, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); > + ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); > + > + /* Query again the temp file unique id */ > + memset(&fid2, 0, sizeof(fid2)); > + res = pNtQueryInformationFile(h, &io, &fid2, sizeof fid2, FileIdInformation); > + ok(res == STATUS_SUCCESS, "can't get fid2, res %x\n", res); > + > + /* Verify we got the same unique id for the file */ > + ok(memcmp(&fid1, &fid2, sizeof fid1) == 0, "file id is not unique\n"); > + > + CloseHandle(h); > + > + h = create_temp_file(0); > + ok(h != NULL, "error creating new file %d\n", GetLastError()); > + > + memset(&fid2, 0, sizeof(fid2)); > + res = pNtQueryInformationFile(h, &io, &fid2, sizeof fid2, FileIdInformation); > + ok(res == STATUS_SUCCESS, "can't get new fid2, res %x\n", res); > + > + /* Verify we got the different unique id for the new file */ > + ok(memcmp(&fid1, &fid2, sizeof fid1) != 0, "file id is not unique\n"); > + > + CloseHandle(h); > + DeleteFileA(buffer); > +} > + > static void test_file_all_information(void) > { > IO_STATUS_BLOCK io; > @@ -4262,4 +4321,5 @@ START_TEST(file) > test_file_disposition_information(); > test_query_volume_information_file(); > test_query_attribute_information_file(); > + test_file_id_information(); > } > diff --git a/include/winternl.h b/include/winternl.h > index 891b6a7..2f2ea86 100644 > --- a/include/winternl.h > +++ b/include/winternl.h > @@ -571,6 +571,15 @@ typedef struct _FILE_INTERNAL_INFORMATION { > LARGE_INTEGER IndexNumber; > } FILE_INTERNAL_INFORMATION, *PFILE_INTERNAL_INFORMATION; > > +typedef struct _FILE_ID_128 { > + UCHAR Identifier[16]; > +} FILE_ID_128, *PFILE_ID_128; > + > +typedef struct _FILE_ID_INFORMATION { > + ULONGLONG VolumeSerialNumber; > + FILE_ID_128 FileId; > +} FILE_ID_INFORMATION, *PFILE_ID_INFORMATION; > + > typedef struct _FILE_EA_INFORMATION { > ULONG EaSize; > } FILE_EA_INFORMATION, *PFILE_EA_INFORMATION; > -- 2.9.3 >

1 0

RE: [PATCH 8/9] server: Added server side mamed pipe read and write implementation and use it for message mode pipes.
by wylda＠volny.cz 10 Feb '17

10 Feb '17

Hi, mamed vs. named? W.

1 0

Re: ntdll: Fixed LdrUnloadDll may recursion unload same dll
by Sebastian Lackner 10 Feb '17

10 Feb '17

On 09.02.2017 10:39, 谢威 wrote: > From 3b5efb522f3ef46b009e6a159a605e087e8841a9 Mon Sep 17 00:00:00 2001 > From: Wei xie <xiewei(a)linuxdeepin.com> > Date: Thu, 19 Jan 2017 14:55:44 +0800 > Subject: [PATCH] ntdll: Fixed LdrUnloadDll may recursion unload same dll > > Signed-off-by: Wei xie <xiewei(a)linuxdeepin.com> > --- > dlls/ntdll/loader.c | 20 +++++++++++++++----- > 1 file changed, 15 insertions(+), 5 deletions(-) > > diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c > index 74feb97..8762917 100644 > --- a/dlls/ntdll/loader.c > +++ b/dlls/ntdll/loader.c > @@ -64,7 +64,7 @@ WINE_DECLARE_DEBUG_CHANNEL(pid); > typedef DWORD (CALLBACK *DLLENTRYPROC)(HMODULE,DWORD,LPVOID); > > static BOOL process_detaching = FALSE; /* set on process detach to avoid deadlocks with thread detach */ > -static int free_lib_count; /* recursion depth of LdrUnloadDll calls */ > +static int free_lib_count = 0; /* recursion depth of LdrUnloadDll calls */ This isn't really necessary, all static variables are initialized to zero. > > static const char * const reason_names[] = > { > @@ -2859,7 +2859,7 @@ static void MODULE_FlushModrefs(void) > * > * The loader_section must be locked while calling this function. > */ > -static void MODULE_DecRefCount( WINE_MODREF *wm ) > +static void MODULE_DecRefCount( WINE_MODREF *wm , BOOL bDeps) > { > int i; > > @@ -2872,13 +2872,13 @@ static void MODULE_DecRefCount( WINE_MODREF *wm ) > --wm->ldr.LoadCount; > TRACE("(%s) ldr.LoadCount: %d\n", debugstr_w(wm->ldr.BaseDllName.Buffer), wm->ldr.LoadCount ); > > - if ( wm->ldr.LoadCount == 0 ) > + if ( wm->ldr.LoadCount == 0 && bDeps) > { > wm->ldr.Flags |= LDR_UNLOAD_IN_PROGRESS; > > for ( i = 0; i < wm->nDeps; i++ ) > if ( wm->deps[i] ) > - MODULE_DecRefCount( wm->deps[i] ); > + MODULE_DecRefCount( wm->deps[i] , TRUE ); > > wm->ldr.Flags &= ~LDR_UNLOAD_IN_PROGRESS; > } > @@ -2893,6 +2893,7 @@ NTSTATUS WINAPI LdrUnloadDll( HMODULE hModule ) > { > WINE_MODREF *wm; > NTSTATUS retv = STATUS_SUCCESS; > + static HMODULE first_recursion_module = 0; > > if (process_detaching) return retv; > > @@ -2900,13 +2901,19 @@ NTSTATUS WINAPI LdrUnloadDll( HMODULE hModule ) > > RtlEnterCriticalSection( &loader_section ); > > + if (0 == free_lib_count) > + first_recursion_module = hModule; > + > free_lib_count++; > if ((wm = get_modref( hModule )) != NULL) > { > TRACE("(%s) - START\n", debugstr_w(wm->ldr.BaseDllName.Buffer)); > > /* Recursively decrement reference counts */ > - MODULE_DecRefCount( wm ); > + if (0 != free_lib_count && first_recursion_module == hModule) > + MODULE_DecRefCount( wm , FALSE ); > + else > + MODULE_DecRefCount( wm , TRUE ); At the location above free_lib_count will always be != 0 - this means that your patch basically disables unloading of dependencies completely. Do you have a small testcase for the problem you are trying to fix? > > /* Call process detach notifications */ > if ( free_lib_count <= 1 ) > @@ -2922,6 +2929,9 @@ NTSTATUS WINAPI LdrUnloadDll( HMODULE hModule ) > > free_lib_count--; > > + if (0 == free_lib_count) > + first_recursion_module = 0; > + > RtlLeaveCriticalSection( &loader_section ); > > return retv; > -- 2.10.2 > > >

1 0

Re: [PATCH 06/16] ntdll: Added support for immediate success returns in server_read_file.
by Alexandre Julliard 10 Feb '17

10 Feb '17

Jacek Caban <jacek(a)codeweavers.com> writes: > @@ -588,10 +588,22 @@ static NTSTATUS server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE a > if (wait_handle) > { > NtWaitForSingleObject( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT), NULL ); > - status = io->u.Status; > NtClose( wait_handle ); > + return io->u.Status; > + } > + > + if (status == STATUS_SUCCESS || status == STATUS_BUFFER_OVERFLOW) > + { > + io->u.Status = status; > + io->Information = total; > + if (event) NtSetEvent( event, NULL ); > + if (apc) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, > + (ULONG_PTR)apc_context, (ULONG_PTR)io, 0 ); > } > + else if (status != STATUS_PENDING && event) > + NtResetEvent( event, NULL ); > > + if (cvalue && status != STATUS_PENDING) NTDLL_AddCompletion( handle, cvalue, status, total ); I think it would be cleaner to do these on the server-side, the same way it's done for the asynchronous case. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 2/2] d2d1: Added support for ID2D1GdiInteropRenderTarget interface
by Henri Verbeet 10 Feb '17

10 Feb '17

On 10 February 2017 at 13:00, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > +static HRESULT STDMETHODCALLTYPE d2d_gdi_interop_render_target_GetDC(ID2D1GdiInteropRenderTarget *iface, > + D2D1_DC_INITIALIZE_MODE mode, HDC *dc) > +{ > + struct d2d_d3d_render_target *render_target = impl_from_ID2D1GdiInteropRenderTarget(iface); > + IDXGISurface1 *surface; > + HRESULT hr; > + > + TRACE("iface %p, mode %d, dc %p.\n", iface, mode, dc); > + > + if (FAILED(hr = d2d_d3d_render_target_get_surface(render_target, &surface))) > + return hr; > + > + hr = IDXGISurface1_GetDC(surface, mode != D2D1_DC_INITIALIZE_MODE_COPY, dc); > + IDXGISurface1_Release(surface); > + > + return hr; > +} > + > +static HRESULT STDMETHODCALLTYPE d2d_gdi_interop_render_target_ReleaseDC(ID2D1GdiInteropRenderTarget *iface, > + const RECT *update) > +{ > + struct d2d_d3d_render_target *render_target = impl_from_ID2D1GdiInteropRenderTarget(iface); > + IDXGISurface1 *surface; > + HRESULT hr; > + > + TRACE("iface %p, update rect %s.\n", iface, wine_dbgstr_rect(update)); > + > + if (FAILED(hr = d2d_d3d_render_target_get_surface(render_target, &surface))) > + return hr; > + > + hr = IDXGISurface1_ReleaseDC(surface, update); This discards "const". > + IDXGISurface1_Release(surface); > + > + return hr; > +} > + Should this sync/flush in case of e.g. a WIC bitmap render target?

1 0

Re: [PATCH 1/7] gdiplus: Make GpBitmap->bitmapbits access thread safe
by Vincent Povirk 10 Feb '17

10 Feb '17

Copying the lock value in move_bitmap seems wrong to me, as it breaks any locks on the destination. Locking the source doesn't make sense because the caller is supposed to control the only reference to it. I'm not sure it makes sense in free_image_data either, as it leaves the image in an invalid state. Anything calling it should have a lock if this is important. I think it is possible to get unlock != true, when GdipImageRotateFlip calls GdipBitmapLockBits.

2 1

Re: [PATCH 2/7] gdiplus: Initialize bitmap bits for reading in GdipBitmapLockBits when ImageFlagsReadOnly is specified
by Dmitry Timoshkov 10 Feb '17

10 Feb '17

Piotr Caban <piotr(a)codeweavers.com> wrote: > /* Make sure we can convert to the requested format. */ > - if (flags & ImageLockModeRead) > + if ((flags & ImageLockModeRead) || (bitmap->image.flags & ImageFlagsReadOnly)) Is there a test for this behaviour? -- Dmitry.

2 3

Re: Participating in Outreachy
by Austin English 10 Feb '17

10 Feb '17

Thanks all! -- -Austin GPG: 14FB D7EA A041 937B On Feb 9, 2017 6:55 AM, "Aric Stewart" <aric(a)codeweavers.com> wrote: On 2/9/17 2:16 AM, Michael Stefaniuc wrote: > On 02/08/2017 11:07 PM, Jeremy White wrote: >> On 02/08/2017 03:45 PM, Marcus Meissner wrote: >>> On Wed, Feb 08, 2017 at 11:12:08AM -0700, Erich E. Hoover wrote: >>>> On Wed, Feb 8, 2017 at 11:00 AM, André Hentschel <nerv(a)dawncrow.de> wrote: >>>>> ... >>>>> The website says 6500$ or sponsored by another org: >>>>> https://wiki.gnome.org/Outreachy/Admin/InfoForOrgs#Action >>>> >>>> Clearly I should have read further ;) I don't know how our benevolent >>>> funding overlords feel about this, but it seems like a good idea to >>>> me. We did spend a lot of time at WineConf trying to figure out ways >>>> to get more people to participate, maybe this project can help. >>> >>> If the 6500 US$ figure is the minimum amount of money, then I would say no. >> >> Sorry, I was coy earlier; I was waiting on some feedback from Karen. >> >> To be clear, CodeWeavers will sponsor it and provide the $6,500. So if > Thank you very much! > >> we have someone to volunteer to coordinate, and a few people willing to >> mentor, we should be good. (I already have Stefan, so we have game >> related stuff covered). > I can mentor too and/or be a backup for Austin on the coordination part. > Though for the mentoring part the usual disclaimer applies: my Wine > technical knowledge is rather broad but very shallow. > > bye > michael > > I am willing and interested in mentoring. I have not been as active recently but still feel like I could help. Sign me up. -aric

1 0

Re: [PATCH 6/7] gdiplus: Reimplement GdipCreateHBITMAPFromBitmap so it can work on locked bitmaps
by Vincent Povirk 10 Feb '17

10 Feb '17

This should probably also be tested with ImageLockModeUserInputBuf.

1 0

Re: [v6 5/6] user32: Send WM_NCPAINT and WM_ERASEBKGND when window is shown and add tests
by Marvin 09 Feb '17

09 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=28472 Your paranoid android. === w7u (32 bit msg) === msg.c:11986: Test failed: WmMouseHoverSeq: 0: the msg sequence is not complete: expected 0118 - actual 0000 msg.c:11988: Test failed: wrong tme.dwFlags 00000001, expected 00000000 msg.c:11988: Test failed: wrong tme.hwndTrack 0023014C, expected 00000000 msg.c:11988: Test failed: wrong tme.dwHoverTime 400, expected 0

1 0

Re: [v6 2/6] user32: Add tests for windows when first shown with SetWindowPos
by Marvin 09 Feb '17

09 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=28469 Your paranoid android. === w7u (32 bit msg) === msg.c:11881: Test failed: WmMouseHoverSeq: 0: the msg sequence is not complete: expected 0118 - actual 0000 msg.c:11883: Test failed: wrong tme.dwFlags 00000001, expected 00000000 msg.c:11883: Test failed: wrong tme.hwndTrack 000F018E, expected 00000000 msg.c:11883: Test failed: wrong tme.dwHoverTime 400, expected 0

1 0

Re: [PATCH] user32: Add tests for disabled buttons receiving WM_LBUTTONUP
by Marvin 09 Feb '17

09 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=28465 Your paranoid android. === w7u (32 bit msg) === msg.c:11637: Test failed: WmMouseHoverSeq: 0: the msg sequence is not complete: expected 0118 - actual 0000 msg.c:11639: Test failed: wrong tme.dwFlags 00000001, expected 00000000 msg.c:11639: Test failed: wrong tme.hwndTrack 000D018C, expected 00000000 msg.c:11639: Test failed: wrong tme.dwHoverTime 400, expected 0

1 0

Re: [v5 6/6] user32: Only send position-change messages when needed
by Marvin 09 Feb '17

09 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=28464 Your paranoid android. === wxppro (32 bit msg) === msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint === w2003std (32 bit msg) === msg.c:5705: Test failed: ShowWindow(SW_SHOWMINNOACTIVE) child with invisible parent: 1: in msg 0x0046 expecting wParam 0x8170 got 0x8160 msg.c:5705: Test failed: ShowWindow(SW_SHOWMINNOACTIVE) child with invisible parent: 4: the msg 0x0047 was expected, but got msg 0x0022 instead msg.c:5705: Test failed: ShowWindow(SW_SHOWMINNOACTIVE) child with invisible parent: 5: the msg 0x0003 was expected, but got msg 0x0047 instead msg.c:5705: Test failed: ShowWindow(SW_SHOWMINNOACTIVE) child with invisible parent: 6: the msg 0x0005 was expected, but got msg 0x0003 instead msg.c:5705: Test failed: ShowWindow(SW_SHOWMINNOACTIVE) child with invisible parent: 11: the msg sequence is not complete: expected 0000 - actual 0005 === wvistau64 (32 bit msg) === msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint === w7u (32 bit msg) === msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint === w7pro64 (32 bit msg) === msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint === wvistau64 (64 bit msg) === msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint === w7pro64 (64 bit msg) === msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint

1 0

Re: [v5 5/6] user32: Send WM_NCPAINT and WM_ERASEBKGND when window is shown and add tests
by Marvin 09 Feb '17

09 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=28463 Your paranoid android. === wxppro (32 bit msg) === msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint === wvistau64 (32 bit msg) === msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint === w7u (32 bit msg) === msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint === w7pro64 (32 bit msg) === msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint === wvistau64 (64 bit msg) === msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint === w7pro64 (64 bit msg) === msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint

1 0

Re: [v5 4/6] user32: Add WM_NCPAINT tests for windows crossing screen or maximized
by Marvin 09 Feb '17

09 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=28462 Your paranoid android. === wxppro (32 bit msg) === msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint === wvistau64 (32 bit msg) === msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint === w7u (32 bit msg) === msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint msg.c:7885: Test failed: destroy child on thread exit: 0: the msg 0x0082 was expected, but got msg 0x000f instead msg.c:7885: Test failed: destroy child on thread exit: 1: the msg 0x000f was expected, but got msg 0x0014 instead msg.c:7885: Test failed: destroy child on thread exit: 2: the msg 0x0014 was expected, but got msg 0x0082 instead msg.c:7885: Test failed: destroy child on thread exit: 3: the msg sequence is not complete: expected 0000 - actual 000f === w7pro64 (32 bit msg) === msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint === wvistau64 (64 bit msg) === msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint === w7pro64 (64 bit msg) === msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5223: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint

1 0

Re: [v5 3/6] user32: Add tests for windows when first shown if they have children
by Marvin 09 Feb '17

09 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=28461 Your paranoid android. === wxppro (32 bit msg) === msg.c:5148: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5148: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint === wvistau64 (32 bit msg) === msg.c:5148: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5148: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint === w7u (32 bit msg) === msg.c:5148: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5148: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint === w7pro64 (32 bit msg) === msg.c:5148: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5148: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint === wvistau64 (64 bit msg) === msg.c:5148: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5148: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint === w7pro64 (64 bit msg) === msg.c:5148: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg 0x0085 should have been sent by BeginPaint msg.c:5148: Test failed: SetWindowPos:show_popup_first_show_window_child2: 3: the msg 0x0014 should have been sent by BeginPaint

1 0

Re: [v5 2/6] user32: Add tests for windows when first shown with SetWindowPos
by Marvin 09 Feb '17

09 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=28460 Your paranoid android. === w7u (32 bit msg) === msg.c:11859: Test failed: WmMouseHoverSeq: 0: the msg sequence is not complete: expected 0118 - actual 0000 msg.c:11861: Test failed: wrong tme.dwFlags 00000001, expected 00000000 msg.c:11861: Test failed: wrong tme.hwndTrack 00130188, expected 00000000 msg.c:11861: Test failed: wrong tme.dwHoverTime 400, expected 0

1 0

Re: [v5 1/6] user32: Add tests for windows when first shown with WS_VISIBLE or RedrawWindow
by Marvin 09 Feb '17

09 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=28459 Your paranoid android. === w2008s64 (32 bit msg) === msg.c:5408: Test failed: ShowWindow(SW_SHOWMINNOACTIVE) child with invisible parent: 1: in msg 0x0046 expecting wParam 0x8170 got 0x8160 msg.c:5408: Test failed: ShowWindow(SW_SHOWMINNOACTIVE) child with invisible parent: 4: the msg 0x0047 was expected, but got msg 0x0022 instead msg.c:5408: Test failed: ShowWindow(SW_SHOWMINNOACTIVE) child with invisible parent: 5: the msg 0x0003 was expected, but got msg 0x0047 instead msg.c:5408: Test failed: ShowWindow(SW_SHOWMINNOACTIVE) child with invisible parent: 6: the msg 0x0005 was expected, but got msg 0x0003 instead msg.c:5408: Test failed: ShowWindow(SW_SHOWMINNOACTIVE) child with invisible parent: 11: the msg sequence is not complete: expected 0000 - actual 0005 === w7u (32 bit msg) === msg.c:7588: Test failed: destroy child on thread exit: 1: the msg sequence is not complete: expected 000f - actual 0000

1 0

Re: [PATCH 1/4] wlanapi: Add a stub for WlanScan
by Bruno Jesus 09 Feb '17

09 Feb '17

I missed the spec changes in the whole series, sorry. Will resent tomorrow. On Thu, Feb 9, 2017 at 4:12 PM, Bruno Jesus <00cpxxx(a)gmail.com> wrote: > Since WlanEnumInterfaces is now doing something applications may start crashing calling the next functions in the process to discover wireless stuff. > > Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> > --- > dlls/wlanapi/main.c | 9 +++++++++ > include/wlanapi.h | 14 ++++++++++++++ > 2 files changed, 23 insertions(+) > > diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c > index 6955245..56c5377 100644 > --- a/dlls/wlanapi/main.c > +++ b/dlls/wlanapi/main.c > @@ -128,6 +128,15 @@ DWORD WINAPI WlanOpenHandle(DWORD client_version, void *reserved, DWORD *negotia > return ERROR_SUCCESS; > } > > +DWORD WINAPI WlanScan(HANDLE handle, const GUID *guid, const DOT11_SSID *ssid, > + const WLAN_RAW_DATA *raw, void *reserved) > +{ > + FIXME("(%p, %s, %p, %p, %p) stub\n", > + handle, wine_dbgstr_guid(guid), ssid, raw, reserved); > + > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > void WINAPI WlanFreeMemory(void *ptr) > { > TRACE("(%p)\n", ptr); > diff --git a/include/wlanapi.h b/include/wlanapi.h > index f6ef60d..f1e302c 100644 > --- a/include/wlanapi.h > +++ b/include/wlanapi.h > @@ -45,10 +45,24 @@ typedef struct _WLAN_INTERFACE_INFO_LIST > WLAN_INTERFACE_INFO InterfaceInfo[1]; > } WLAN_INTERFACE_INFO_LIST, *PWLAN_INTERFACE_INFO_LIST; > > +#define DOT11_SSID_MAX_LENGTH 32 > +typedef struct _DOT11_SSID > +{ > + DWORD uSSIDLength; > + UCHAR ucSSID[DOT11_SSID_MAX_LENGTH]; > +} DOT11_SSID; > + > +typedef struct _WLAN_RAW_DATA > +{ > + DWORD dwDataSize; > + BYTE DataBlob[1]; > +} WLAN_RAW_DATA, *PWLAN_RAW_DATA; > + > DWORD WINAPI WlanCloseHandle(HANDLE, void *); > DWORD WINAPI WlanEnumInterfaces(HANDLE, void *, WLAN_INTERFACE_INFO_LIST **); > DWORD WINAPI WlanOpenHandle(DWORD, void *, DWORD *, HANDLE *); > void *WINAPI WlanAllocateMemory(DWORD); > void WINAPI WlanFreeMemory(void *); > +DWORD WINAPI WlanScan(HANDLE, const GUID *, const DOT11_SSID *, const WLAN_RAW_DATA *, void *); > > #endif /* _WLAN_WLANAPI_H */ > -- > 2.9.3 >

1 0

Re: [v2 3/5] compobj.dll16: Implement CoCreateInstance16().
by Alexandre Julliard 09 Feb '17

09 Feb '17

Zebediah Figura <z.figura12(a)gmail.com> writes: > @@ -899,17 +899,22 @@ HRESULT WINAPI CoCreateGuid16(GUID *pguid) > * CoCreateInstance [COMPOBJ.13] > */ > HRESULT WINAPI CoCreateInstance16( > - REFCLSID rclsid, > - LPUNKNOWN pUnkOuter, > - DWORD dwClsContext, > - REFIID iid, > - LPVOID *ppv) > -{ > - FIXME("(%s, %p, %x, %s, %p), stub!\n", > - debugstr_guid(rclsid), pUnkOuter, dwClsContext, debugstr_guid(iid), > - ppv > - ); > - return E_NOTIMPL; > + REFCLSID rclsid, > + LPUNKNOWN pUnkOuter, > + DWORD dwClsContext, > + REFIID riid, > + LPVOID *ppv) > +{ > + IClassFactory *cf; > + HRESULT hr; > + > + hr = CoGetClassObject16(rclsid, dwClsContext, NULL, &IID_IClassFactory, (void **)&cf); > + if (FAILED(hr)) > + return hr; > + > + hr = IClassFactory_CreateInstance(cf, pUnkOuter, riid, ppv); > + IClassFactory_Release(cf); > + return hr; CoGetClassObject16 is supposed to return a 16-bit interface, you can't call it like that. How did you test this? -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 1/7] gdiplus: Make GpBitmap->bitmapbits access thread safe
by Dmitry Timoshkov 09 Feb '17

09 Feb '17

Piotr Caban <piotr(a)codeweavers.com> wrote: > +static inline BOOL image_lock(GpImage *image, BOOL *unlock) > +{ > + LONG id = GetCurrentThreadId(), v; > + v = InterlockedCompareExchange(&image->busy, id, 0); > + *unlock = !v; > + return !v || v==id; > +} Variable 'v' could have a better naming, for instance 'busy' or 'owner_tid'. > +static inline void image_unlock(GpImage *image, BOOL unlock) > +{ > + if (unlock) image->busy = 0; > +} Is that even possible to get image_unlock() called with unlock != TRUE? -- Dmitry.

2 1

Re: [PATCH] iphlpapi: Retrieve DNS servers from /etc/resolv.conf if possible
by Erich E. Hoover 09 Feb '17

09 Feb '17

On Tue, Jan 31, 2017 at 1:36 AM, Bruno Jesus <00cpxxx(a)gmail.com> wrote: > Tested on FreeBSD 10 and PC-BSD 9 where it gives me the unimplemented message (and Debian by changing some defines). > ... Is the purpose of this to provide a fallback implementation or to get FreeBSD 10 and PC-BSD 9 working? From a quick googling it looks like FreeBSD and PC-BSD both should support __res_getservers, though NetBSD seems to use res_getservers. Are you possibly missing a header (or are we failing to include a header)? Best, Erich

4 10

Re: [PATCH 6/9] wined3d: Generate code for compute shaders.
by Matteo Bruni 09 Feb '17

09 Feb '17

2017-02-09 12:00 GMT+01:00 Józef Kucia <jkucia(a)codeweavers.com>: > + shader_id = GL_EXTCALL(glCreateShader(GL_COMPUTE_SHADER)); > + > + shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, &reg_maps->shader_version)); > + > + shader_glsl_enable_extensions(buffer, gl_info); > + if (gl_info->supported[ARB_COMPUTE_SHADER]) > + shader_addline(buffer, "#extension GL_ARB_compute_shader : enable\n"); I don't know it for a fact but it seems weird to me that explicitly enabling the extension in the GLSL source is ever necessary, given that you just created the shader with GL_COMPUTE_SHADER anyway... FWIW the extension enable is not mentioned in the ARB_compute_shader spec.

2 2

Re: [PATCH] wininet: Don't try to read data when the server response is HTTP_STATUS_NOT_MODIFIED
by Jacek Caban 09 Feb '17

09 Feb '17

Hi Young, The fix itself seems right, but the test needs more work. Since we close connection after each request in server_thread, the test passes even without your fix. You could probably just include some garbage data after response so that we can see that it's not used. Also see some minor comments bellow. On 08.02.2017 01:38, Young Chung wrote: > diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c > index fb64e3c..8cdeb8e 100644 > --- a/dlls/wininet/tests/http.c > +++ b/dlls/wininet/tests/http.c > @@ -2017,6 +2017,10 @@ static const char notokmsg[] = > "Server: winetest\r\n" > "\r\n"; > > +static const char notmodified[] = > +"HTTP/1.1 304 Not Modified\r\n" > +"\r\n"; > + > static const char noauthmsg[] = > "HTTP/1.1 401 Unauthorized\r\n" > "Server: winetest\r\n" > @@ -2295,6 +2299,11 @@ static DWORD CALLBACK server_thread(LPVOID param) > WaitForSingleObject(conn_close_event, INFINITE); > trace("closing connection\n"); > } > + if (strstr(buffer, "GET /test_not_modified")) > + { > + if (strstr(buffer, "If-Modified-Since:")) send(c, notmodified, sizeof notmodified - 1, 0); > + else send(c, notokmsg, sizeof(notokmsg) - 1, 0); > + } > if (strstr(buffer, "GET /test_cache_control_no_cache")) > { > static const char no_cache_response[] = "HTTP/1.1 200 OK\r\nCache-Control: no-cache\r\n\r\nsome content"; > @@ -3470,6 +3479,56 @@ static void test_conn_close(int port) > CloseHandle(hCompleteEvent); > } > > +static void test_not_modified(int port) > +{ > + static const char ifmodified[] = {'I','f','-','M','o','d','i','f','i','e','d','-','S','i','n','c','e',':',' '}; > + HINTERNET session, connection, req; > + DWORD res, status, size; > + BOOL ret; > + SYSTEMTIME st; > + char today[sizeof(ifmodified) + INTERNET_RFC1123_BUFSIZE + 3], buffer[32]; > + > + trace("Testing 304 not modified response...\n"); > + > + memcpy(today, ifmodified, sizeof(ifmodified)); > + GetSystemTime(&st); > + InternetTimeFromSystemTimeA(&st, INTERNET_RFC1123_FORMAT, &today[sizeof(ifmodified)], sizeof(today)-sizeof(ifmodified)); > + > + session = InternetOpenA("", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); > + ok(session != NULL,"InternetOpen failed with error %u\n", GetLastError()); > + > + connection = InternetConnectA(session, "localhost", port, > + NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); > + ok(connection != NULL,"InternetConnect failed with error %u\n", GetLastError()); > + > + req = HttpOpenRequestA(connection, "GET", "/test_not_modified", NULL, NULL, NULL, > + INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RESYNCHRONIZE, 0xdeadbead); > + ok(req != NULL, "HttpOpenRequest failed: %u\n", GetLastError()); Please use open_simple_request helper here. > + > + res = HttpSendRequestA(req, today, -1, NULL, 0); > + ok(res, "HttpSendRequest failed: %u\n", GetLastError()); > + > + buffer[0] = 0; > + size = sizeof(buffer); > + ret = HttpQueryInfoA(req, HTTP_QUERY_IF_MODIFIED_SINCE | HTTP_QUERY_FLAG_REQUEST_HEADERS, &buffer, &size, NULL); > + ok(ret, "HttpQueryInfoA(HTTP_QUERY_IF_MODIFIED_SINCE) failed %u\n", GetLastError()); > + > + status = 0xdeadbeef; > + size = sizeof(status); > + ret = HttpQueryInfoA(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); > + ok(ret, "HttpQueryInfoA(HTTP_QUERY_STATUS_CODE) failed %u\n", GetLastError()); > + ok(status == 304, "got %u\n", status); It would be nice to test HTTP_QUERY_CONTENT_LENGTH here as well. > + > + size = 0xdeadbeef; > + res = InternetQueryDataAvailable(req, &size, 0, 0); > + ok(res, "InternetQueryDataAvailable failed: %u\n", GetLastError()); > + ok(size == 0, "size != 0\n"); > + > + InternetCloseHandle(req); > + InternetCloseHandle(connection); > + InternetCloseHandle(session); > +} Use close_request(). Thanks, Jacek

1 0

Re: [PATCH 1/2] user32: Allow creating windows using null driver for invisible winstations.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Jacek Caban <jacek(a)codeweavers.com> writes: > The main motivation is Office 2016 installer, which creates a > non-HWND_MESSAGE window in its service (although it seems to be for > message only purposes). It is supported on Windows. > > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Hacking only CreateWindow means the driver will get calls for windows that it hasn't created, that's ugly. Also the window station can change dynamically, so we need better mechanisms to handle that sort of thing. Ideally the driver would also have support for it, so that you could do things like having separate window stations for separate X displays within the same session. -- Alexandre Julliard julliard(a)winehq.org

2 3

Fwd: Participating in Outreachy
by Austin English 09 Feb '17

09 Feb '17

-- -Austin GPG: 14FB D7EA A041 937B ---------- Forwarded message ---------- From: "Karen Sandler" <karen(a)sfconservancy.org> Date: Feb 7, 2017 8:10 PM Subject: Participating in Outreachy To: <project-reps(a)sfconservancy.org> Cc: Hi Project Reps! The Outreachy program[1] (which is also a Conservancy member project) is working on its next round, set to open on February 16. If you are interested in participating as an "organization", now's a good time to get started[2]! The sooner your project is listed, the more likely you'll get strong applicants. best, karen [1]http://outreachy.org [2]https://wiki.gnome.org/Outreachy/Admin/InfoForOrgs#Requir ements_for_Organizations

11 23

Re: [1/2] iphlpapi: Add GetUnicastIpAddressEntry implementation (try 4)
by Alexandre Julliard 09 Feb '17

09 Feb '17

André Hentschel <nerv(a)dawncrow.de> writes: > @@ -78,6 +80,17 @@ typedef enum { > ScopeLevelGlobal = 14 > } SCOPE_LEVEL; > > +typedef struct > +{ > + union { > + struct { > + ULONG Zone : 28; > + ULONG Level : 4; > + }; > + ULONG Value; > + }; > +} SCOPE_ID, *PSCOPE_ID; Anonymous unions and structs are not portable, please check how this is handled in other places. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [Tools] winetest: Add support for reports containing pids.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Francois Gouget <fgouget(a)codeweavers.com> writes: > diff --git a/winetest/dissect b/winetest/dissect > index d9404fe2..8ef31b01 100755 > --- a/winetest/dissect > +++ b/winetest/dissect > @@ -306,7 +306,7 @@ while (<IN>) { > $dll = undef; > mydie "too many tests skipped by user request\n" if ++$user_skips > $maxuserskips; > } > - } elsif (/^(.*$unit.*: (\d+) tests executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\.)\r?$/) { > + } elsif (/^($unit:(?:0x[0-9a-f]+)? (\d+) tests executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\.)\r?$/) { This may be bikeshedding, but I feel that it would be nicer to use the %04x format we use for pid in other places. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [v2 PATCH] dxgi: Added support for DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE
by Marvin 09 Feb '17

09 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=28438 Your paranoid android. === w864 (64 bit device) === device.c:1497: Test failed: SetFullscreenState failed, hr 0x887a0022. device.c:1498: Test failed: Got window rect (0,0)-(400,200), expected (0,0)-(800,600). device.c:1498: Test failed: Got client rect (0,0)-(394,171), expected (0,0)-(800,600). device.c:1498: Test failed: Got monitor rect (0,0)-(1024,768), expected (0,0)-(800,600). device.c:1498: Test failed: Got windowed 0x1, expected 0. device.c:1498: Test failed: Got fullscreen 0, expected 0x1.

1 0

Re: [PATCH v2 1/6] wined3d: Fix querying texture-related limits on core profile.
by Henri Verbeet 08 Feb '17

08 Feb '17

On 7 February 2017 at 22:08, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c > index c47052c..bfb018e 100644 > --- a/dlls/wined3d/directx.c > +++ b/dlls/wined3d/directx.c > @@ -3405,24 +3405,35 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) > } > if (gl_info->supported[ARB_MULTITEXTURE]) > { > - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &gl_max); > - gl_info->limits.textures = min(MAX_TEXTURES, gl_max); > - TRACE("Max textures: %d.\n", gl_info->limits.textures); > + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) > + { > + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &gl_max); > + gl_info->limits.textures = min(MAX_TEXTURES, gl_max); > + TRACE("Max textures: %d.\n", gl_info->limits.textures); > > - if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) > + if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) > + { > + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &gl_max); > + gl_info->limits.texture_coords = min(MAX_TEXTURES, gl_max); > + } > + else > + { > + gl_info->limits.texture_coords = max(gl_info->limits.texture_coords, gl_max); > + } > + TRACE("Max texture coords: %d.\n", gl_info->limits.texture_coords); > + } > + > + if (gl_info->supported[ARB_FRAGMENT_PROGRAM] || gl_info->supported[ARB_FRAGMENT_SHADER]) > { > GLint tmp; > - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &gl_max); > - gl_info->limits.texture_coords = min(MAX_TEXTURES, gl_max); > + > gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &tmp); > gl_info->limits.fragment_samplers = min(MAX_FRAGMENT_SAMPLERS, tmp); > } > else > { > - gl_info->limits.texture_coords = max(gl_info->limits.texture_coords, gl_max); > gl_info->limits.fragment_samplers = max(gl_info->limits.fragment_samplers, gl_max); > } > - TRACE("Max texture coords: %d.\n", gl_info->limits.texture_coords); > TRACE("Max fragment samplers: %d.\n", gl_info->limits.fragment_samplers); > > if (gl_info->supported[ARB_VERTEX_SHADER]) This still doesn't really look logical to me.

2 2

Re: [v2 PATCH] dxgi: Added support for DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE
by Marvin 08 Feb '17

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

1 0

Re: [PATCH] compobj.dll16: Implement CoGetClassObject().
by Huw Davies 08 Feb '17

08 Feb '17

On Sat, Feb 04, 2017 at 07:47:32PM -0600, Zebediah Figura wrote: > Fixes bug https://bugs.winehq.org/show_bug.cgi?id=41209 > > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/compobj.dll16/compobj.c | 242 +++++++++++++++++++++++++++++++--- > dlls/compobj.dll16/compobj.dll16.spec | 2 +- > 2 files changed, 222 insertions(+), 22 deletions(-) > Hi Zebediah, This patch could be split into a series of smaller patches. For example, implement CoGetClassObject16() first, then CoCreateInstance16() as a seperate patch, and then CoFreeAllLibraries(). I've inlined some comments below. > diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c > index b934a06..1b100c3 100644 > --- a/dlls/compobj.dll16/compobj.c > +++ b/dlls/compobj.dll16/compobj.c > @@ -30,6 +30,8 @@ > #include <string.h> > #include <assert.h> > > +#define COBJMACROS > + > #include "windef.h" > #include "winbase.h" > #include "winuser.h" > @@ -42,6 +44,7 @@ > #include "wtypes.h" > #include "wine/unicode.h" > #include "wine/winbase16.h" > +#include "wine/list.h" > > #include "wine/debug.h" > > @@ -98,6 +101,115 @@ static inline IMalloc16Impl *impl_from_IMalloc16(IMalloc16 *iface) > return CONTAINING_RECORD(iface, IMalloc16Impl, IMalloc16_iface); > } > > +typedef HRESULT (CALLBACK *DllGetClassObjectFunc)(REFCLSID clsid, REFIID iid, LPVOID *ppv); > +typedef HRESULT (WINAPI *DllCanUnloadNowFunc)(void); > + > +typedef struct tagOpenDll > +{ > + LONG refs; > + LPSTR library_name; > + HMODULE16 library; > + DllGetClassObjectFunc DllGetClassObject; > + DllCanUnloadNowFunc DllCanUnloadNow; > + struct list entry; > +} OpenDll; Why not call the typedef open_dll and drop the tag name - it's not used. Or better yet, ditch the typedef and just use struct open_dll throughout. > +static struct list openDllList = LIST_INIT(openDllList); Similarly rename to open_dll_list. > + > +/***************************************************************************** > + * This section contains OpenDllList implementation > + */ > + > +static OpenDll *COMPOBJ16_DllList_Get(LPCSTR library_name) > +{ > + OpenDll *ptr; > + LIST_FOR_EACH_ENTRY(ptr, &openDllList, OpenDll, entry) > + { > + if (!strcasecmp(library_name, ptr->library_name) && > + ++(ptr->refs) != 1) /* entry is being destroy if == 1 */ This reference handling looks odd - at the very least you're leaving a previously zero ref count at one. Also, how about naming this function (and others similarly below) dll_list_get()? > +/* pass FALSE for free_entry to release a reference without destroying the > + * entry if it reaches zero or TRUE otherwise */ > +static void COMPOBJ16_DllList_ReleaseRef(OpenDll *entry) > +{ > + if (--(entry->refs) == 0) > + { > + list_remove(&entry->entry); > + > + TRACE("freeing %x\n", entry->library); > + FreeLibrary16(entry->library); > + > + HeapFree(GetProcessHeap(), 0, entry->library_name); > + HeapFree(GetProcessHeap(), 0, entry); > + } > +} > + > /****************************************************************************** > * IMalloc16_QueryInterface [COMPOBJ.500] > */ > @@ -279,13 +391,34 @@ HRESULT WINAPI CoCreateStandardMalloc16(DWORD dwMemContext, > return S_OK; > } > > +/*********************************************************************** > + * CoFreeAllLibraries [COMPOBJ.12] > + */ > +void WINAPI CoFreeAllLibraries16(void) > +{ > + OpenDll *entry, *next; > + > + TRACE("()\n"); > + LIST_FOR_EACH_ENTRY_SAFE(entry, next, &openDllList, OpenDll, entry) > + { > + list_remove(&entry->entry); > + > + TRACE("freeing %x\n", entry->library); > + FreeLibrary16(entry->library); > + > + HeapFree(GetProcessHeap(), 0, entry->library_name); > + HeapFree(GetProcessHeap(), 0, entry); > + } > +} > + This code and the code in COMPOBJ16_DllList_ReleaseRef are essentially the same, it should be possible to avoid this duplication. Huw.

2 1

Re: [PATCH] kernel32/nls: Added Bangla locale data
by Nikolay Sivov 08 Feb '17

08 Feb '17

Wrong sublang here, please skip this one.

1 0

Re: [PATCH] winex11: Pass correct buffer length to RegQueryValueExW()
by Ken Thomases 08 Feb '17

08 Feb '17

On Feb 8, 2017, at 5:46 AM, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > > Similar change could also be applied to Mac driver. Yeah, I had a patch in my working tree since I saw your original submission, but then code freeze. :) -Ken

1 0

Re: oleaut32: Make the heap allocation functions static.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Francois Gouget <fgouget(a)free.fr> writes: > Signed-off-by: Francois Gouget <fgouget(a)free.fr> > --- > > These were supposed to see more widespread usage but it has not happened > in the past 3 years. I blame Michael ;-) If you really want to change them, I'd suggest to do it the way it's done in most other places, as static inline functions in the header. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 4/6] wined3d: Implement compute pipeline UAV binding.
by Henri Verbeet 08 Feb '17

08 Feb '17

On 8 February 2017 at 11:54, Józef Kucia <jkucia(a)codeweavers.com> wrote: > diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c > index 422f3f1..f2e10a8 100644 > --- a/dlls/wined3d/cs.c > +++ b/dlls/wined3d/cs.c > @@ -44,6 +44,7 @@ enum wined3d_cs_op > WINED3D_CS_OP_SET_TEXTURE, > WINED3D_CS_OP_SET_SHADER_RESOURCE_VIEW, > WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW, > + WINED3D_CS_OP_SET_COMPUTE_UAV, It's a little undesirable to introduce multiple operations that are largely the same, although I don't necessarily see a good way to avoid it either right now. > @@ -1053,6 +1054,35 @@ static void wined3d_cs_exec_set_unordered_access_view(struct wined3d_cs *cs, con > device_invalidate_state(cs->device, STATE_UNORDERED_ACCESS_VIEW_BINDING); > } > > +void wined3d_cs_emit_set_compute_unordered_access_view(struct wined3d_cs *cs, unsigned int view_idx, > + struct wined3d_unordered_access_view *view) > +{ > + struct wined3d_cs_set_unordered_access_view *op; > + > + op = cs->ops->require_space(cs, sizeof(*op)); > + op->opcode = WINED3D_CS_OP_SET_COMPUTE_UAV; > + op->view_idx = view_idx; > + op->view = view; > + > + cs->ops->submit(cs); > +} > + > +static void wined3d_cs_exec_set_compute_unordered_access_view(struct wined3d_cs *cs, const void *data) > +{ > + const struct wined3d_cs_set_unordered_access_view *op = data; > + struct wined3d_unordered_access_view *prev; > + > + prev = cs->state.compute_unordered_access_view[op->view_idx]; > + cs->state.compute_unordered_access_view[op->view_idx] = op->view; > + > + if (op->view) > + InterlockedIncrement(&op->view->resource->bind_count); > + if (prev) > + InterlockedDecrement(&prev->resource->bind_count); > + > + device_invalidate_state(cs->device, STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING); > +} I should have noticed this when WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW was introduced, but these are between wined3d_cs_exec_set_shader_resource_view() and wined3d_cs_emit_set_shader_resource_view(), please don't do that. More generally, all the other handlers have execution above emission, I think it's best to stick with that.

1 0

Re: [PATCH v2 2/6] d3d11/tests: Add test for interleaved Draw() and Dispatch() calls.
by Henri Verbeet 08 Feb '17

08 Feb '17

On 8 February 2017 at 11:54, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > > Version 2: Remove checks for backbuffer content. > > --- > dlls/d3d11/tests/d3d11.c | 182 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 182 insertions(+) > This is taking on the order of 10 seconds per draw/dispatch pair, or 30 seconds for the entire test, for me on Windows. That's still manageable, but I suspect that's longer than intended, and could at some point cause the test to timeout during automated runs.

1 0

Re: [PATCH 3/3] dxgi: Added support for DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE
by Henri Verbeet 08 Feb '17

08 Feb '17

On 8 February 2017 at 09:26, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > @@ -5275,7 +5275,7 @@ static HRESULT CDECL device_parent_sub_resource_created(struct wined3d_device_pa > } > > static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_device_parent *device_parent, > - void *container_parent, const struct wined3d_resource_desc *wined3d_desc, > + void *container_parent, const struct wined3d_resource_desc *wined3d_desc, DWORD texture_flags, > struct wined3d_texture **wined3d_texture) > { > struct d3d_device *device = device_from_wined3d_device_parent(device_parent); > @@ -5299,7 +5299,7 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic > desc.Usage = D3D10_USAGE_DEFAULT; > desc.BindFlags = D3D10_BIND_RENDER_TARGET; > desc.CPUAccessFlags = 0; > - desc.MiscFlags = 0; > + desc.MiscFlags = texture_flags & WINED3D_TEXTURE_CREATE_GET_DC ? D3D10_RESOURCE_MISC_GDI_COMPATIBLE: 0; Please also print a FIXME for other flags. > diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c > index 805694b853..bf6653a42b 100644 > --- a/dlls/d3d8/device.c > +++ b/dlls/d3d8/device.c > @@ -3036,7 +3036,8 @@ static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent * > } > > static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_device_parent *device_parent, > - void *container_parent, const struct wined3d_resource_desc *desc, struct wined3d_texture **texture) > + void *container_parent, const struct wined3d_resource_desc *desc, DWORD texture_flags, > + struct wined3d_texture **texture) > { > struct d3d8_device *device = device_from_device_parent(device_parent); > struct d3d8_surface *d3d_surface; Likewise, I think we should do a little more here. Either passing the texture flags along to wined3d_texture_create(), or just printing a FIXME in case they're non-zero. > diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c > index e646cb76c7..923ced55b4 100644 > --- a/dlls/d3d9/device.c > +++ b/dlls/d3d9/device.c > @@ -3746,7 +3746,8 @@ static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent * > } > > static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_device_parent *device_parent, > - void *container_parent, const struct wined3d_resource_desc *desc, struct wined3d_texture **texture) > + void *container_parent, const struct wined3d_resource_desc *desc, DWORD texture_flags, > + struct wined3d_texture **texture) > { > struct d3d9_device *device = device_from_device_parent(device_parent); > DWORD flags = WINED3D_TEXTURE_CREATE_MAPPABLE; I could live with adding WINED3D_TEXTURE_CREATE_GET_DC in device_parent_create_swapchain_texture() in d3d9, but ideally we'd set the appropriate flag on swapchain creation.

1 0

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

08 Feb '17

On 7 February 2017 at 22:08, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > +static void test_vb_refcount(void) > +{ > + ULONG prev_d3d_refcount, prev_device_refcount; > + ULONG cur_d3d_refcount, cur_device_refcount; > + D3DVERTEXBUFFERDESC vb_desc; > + IDirect3DVertexBuffer *vb; > + IDirect3DDevice3 *device; > + IDirect3D3 *d3d; > + HWND window; > + HRESULT hr; > + > + window = CreateWindowA("static", "d3d3_test", WS_OVERLAPPEDWINDOW, > + 0, 0, 640, 480, 0, 0, 0, 0); > + if (!(device = create_device(window, DDSCL_NORMAL))) > + { > + skip("Failed to create a 3D device, skipping test.\n"); > + DestroyWindow(window); > + return; > + } > + > + hr = IDirect3DDevice3_GetDirect3D(device, &d3d); > + ok(SUCCEEDED(hr), "Failed to get Direct3D3 interface, hr %#x.\n", hr); > + > + IDirect3D3_AddRef(d3d); > + prev_d3d_refcount = IDirect3D3_Release(d3d); Why not get_refcount()? > + hr = IDirect3D3_CreateVertexBuffer(d3d, &vb_desc, &vb, 0, NULL); > + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); > + > + IDirect3D3_AddRef(d3d); > + cur_d3d_refcount = IDirect3D3_Release(d3d); > + IDirect3DDevice3_AddRef(device); > + cur_device_refcount = IDirect3DDevice3_Release(device); > + ok(cur_d3d_refcount == prev_d3d_refcount, "D3D object refcount changed from %u to %u.\n", > + prev_d3d_refcount, cur_d3d_refcount); > + ok(cur_device_refcount == prev_device_refcount, "D3D device refcount changed from %u to %u.\n", > + prev_device_refcount, cur_device_refcount); > + > + IDirect3DVertexBuffer_Release(vb); It might not be bad to check the reference count after release as well. > diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c > index 797afe2..7914805e 100644 > --- a/dlls/ddraw/vertexbuffer.c > +++ b/dlls/ddraw/vertexbuffer.c > @@ -126,16 +126,26 @@ static ULONG WINAPI d3d_vertex_buffer1_AddRef(IDirect3DVertexBuffer *iface) > return d3d_vertex_buffer7_AddRef(&buffer->IDirect3DVertexBuffer7_iface); > } > > +static void d3d_vertex_buffer_destroy(struct d3d_vertex_buffer *buffer) > +{ > + struct wined3d_buffer *vb = NULL; > + UINT offset, stride; > + > + /* D3D7 vertex buffers don't stay bound in the device, they are passed > + * as a parameter to DrawPrimitiveVB. DrawPrimitiveVB sets them as the > + * stream source in wined3d and they should get unset there before > + * they are destroyed. */ > + wined3d_mutex_lock(); > + wined3d_device_get_stream_source(buffer->ddraw->wined3d_device, > + 0, &vb, &offset, &stride); > + if (vb == buffer->wined3d_buffer) > + wined3d_device_set_stream_source(buffer->ddraw->wined3d_device, 0, NULL, 0, 0); > + > + wined3d_vertex_declaration_decref(buffer->wined3d_declaration); > + wined3d_buffer_decref(buffer->wined3d_buffer); > + wined3d_mutex_unlock(); > +} We'd typically call this kind of function d3d_vertex_buffer_cleanup(), the difference being that _destroy() deallocates the object itself, while _cleanup() only releases references, allocations, etc. inside the object. > static ULONG WINAPI d3d_vertex_buffer1_Release(IDirect3DVertexBuffer *iface) > { > struct d3d_vertex_buffer *buffer = impl_from_IDirect3DVertexBuffer(iface); > + ULONG ref = InterlockedDecrement(&buffer->ref); > > - TRACE("iface %p.\n", iface); > + TRACE("%p decreasing refcount to %u.\n", buffer, ref); > > - return d3d_vertex_buffer7_Release(&buffer->IDirect3DVertexBuffer7_iface); > + if (!ref) > + { > + d3d_vertex_buffer_destroy(buffer); > + > + HeapFree(GetProcessHeap(), 0, buffer); > + } > + return ref; > } Does this imply that if you query an IDirect3DVertexBuffer interface from an IDirect3DVertexBuffer7, and that ends up being the last reference to be released, the ddraw reference should be released? (And in the reverse case, that you'd release a reference you don't have.) For surfaces and palettes, we use the "ifaceToRelease" mechanism for this kind of thing.

1 0

Re: mshtml/tests: A couple of spelling fixes in ok() messages.
by Marvin 08 Feb '17

08 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=28408 Your paranoid android. === w7u (32 bit htmldoc) === htmldoc.c:2670: Test failed: unexpected call GetOverrideKeyPath

1 0

Re: [PATCH 1/2] localspl: Clear LastError on success in AddMonitor [v2]
by Huw Davies 08 Feb '17

08 Feb '17

Hi Detlef, On Tue, Feb 07, 2017 at 11:22:35PM +0100, Detlef Riekenberg wrote: > dlls/localspl/provider.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c > index f359b73..3a912b1 100644 > --- a/dlls/localspl/provider.c > +++ b/dlls/localspl/provider.c > @@ -1507,6 +1507,8 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) > } > monitor_unload(pm); > > + SetLastError(ERROR_SUCCESS); /* Monitor installer depend on this */ I've sent version 3 of this series in your name that fixes the typo in this comment. Thanks, Huw.

1 0

Re: [PATCH] kernel32: fix command line argument escaping in build_command_line
by Vincent Povirk 08 Feb '17

08 Feb '17

Is it really necessary to rewrite this loop? It'd be better to fix the existing code, if possible.

3 2

Re: [PATCH] dbghelp: Always return a dos path from SymGetLineFromAddr
by Huw Davies 08 Feb '17

08 Feb '17

On Mon, Jan 30, 2017 at 07:04:51AM +0000, Alistair Leslie-Hughes wrote: > Fixes: https://bugs.winehq.org/show_bug.cgi?id=34687 > > Bases off the information in MSDN. > > https://msdn.microsoft.com/en-us/library/windows/desktop/ms681330%28v=vs.85… > "This function returns a pointer to a buffer that may be reused by another function. > Therefore, be sure to copy the data returned to another buffer immediately." > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/dbghelp/symbol.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c > index 08ea834..1638a1e 100644 > --- a/dlls/dbghelp/symbol.c > +++ b/dlls/dbghelp/symbol.c > @@ -1435,9 +1435,11 @@ BOOL WINAPI SymGetSymFromName(HANDLE hProcess, PCSTR Name, PIMAGEHLP_SYMBOL Symb > BOOL symt_fill_func_line_info(const struct module* module, const struct symt_function* func, > DWORD64 addr, IMAGEHLP_LINE64* line) > { > + static char path[MAX_PATH]; > struct line_info* dli = NULL; > BOOL found = FALSE; > int i; > + WCHAR *dos_path; > > assert(func->symt.tag == SymTagFunction); > > @@ -1455,7 +1457,10 @@ BOOL symt_fill_func_line_info(const struct module* module, const struct symt_fun > } > if (found) > { > - line->FileName = (char*)source_get(module, dli->u.source_file); > + dos_path = wine_get_dos_file_name((char*)source_get(module, dli->u.source_file)); > + WideCharToMultiByte(CP_ACP, 0, dos_path, -1, path, MAX_PATH, NULL, NULL); > + HeapFree( GetProcessHeap(), 0, dos_path ); > + line->FileName = path; > return TRUE; > } > } This has implications for winedbg that at least need to be discussed. For example, with this patch, backtraces contain Windows-like paths. I imagine there will be more serious issues too. For the patch itself, you now have a Unicode string, so it would make sense to have symt_fill_func_line_info() return that, then switch the dependencies so that SymGetLineFromAddr64() calls SymGetLineFromAddrW64(). To create the ANSI buffer, you probably want to use fetch_buffer() rather than a static array. Huw.

2 1

Re: [v3 2/6] user32: Add tests for windows when first shown with SetWindowPos
by Alexandre Julliard 07 Feb '17

07 Feb '17

Fabian Maurer <dark.shadow4(a)web.de> writes: > These tests need the fix for WM_WINDOWPOSCHANGING and > WM_WINDOWPOSCHANGED to not fail. Then you should mark them as todo, and remove the todos in the patch that fixes them. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [v3 1/6] user32: Add tests for windows when first shown with WS_VISIBLE or RedrawWindow
by Fabian Maurer 07 Feb '17

07 Feb '17

I just noted that this patch, and the second from the same series got marked as "Test failure". I don't really understand why though, is it because my patches introduce temporary test errors? I could use wine_todo, but since the wiki said to "send the tests as a separate patch before the fix" and I did fix the test failures right away I didn't think that's necessary. Or is it something else that's wrong? Regards, Fabian Maurer

1 0

Re: [resend 1/2] winex11: Don't send fake caption click to windows without a caption.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Grazvydas Ignotas <notasas(a)gmail.com> writes: > Confuses TFM/VGM Music Maker, see bug 41647. > > The problem triggers at the time the window is activated as a result of > SetWindowPos(), then WM_MOUSEACTIVATE arrives which definitely doesn't > happen on Windows. Probably should somehow get rid the fake click > completely, but it has been around for a very long time and this patch > is enough to fix the app. That doesn't seem right. Probably what you want is to skip the fake click if the window is already active or something along those lines. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v2 PATCH 1/4] shell32: Added IShellImageData stub
by Alex Henrie 07 Feb '17

07 Feb '17

+static inline WCHAR *strdupW(const WCHAR *src) +{ + WCHAR *dest; + if (!src) return NULL; + dest = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(*dest)); + if (dest) + lstrcpyW(dest, src); + return dest; +} This looks better, but it would still be nice to consistently indent or not indent after the if statements. -Alex

1 0

Re: winex11: Fix alpha blending in X11DRV_UpdateLayeredWindow.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Sebastian Lackner <sebastian(a)fds-team.de> writes: > @@ -2627,14 +2627,12 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO > { > IntersectRect( &rect, &rect, info->prcDirty ); > memcpy( src_bits, dst_bits, bmi->bmiHeader.biSizeImage ); > - PatBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS ); > - } > - ret = GdiAlphaBlend( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, > - info->hdcSrc, > - rect.left + (info->pptSrc ? info->pptSrc->x : 0), > - rect.top + (info->pptSrc ? info->pptSrc->y : 0), > - rect.right - rect.left, rect.bottom - rect.top, > - (info->dwFlags & ULW_ALPHA) ? *info->pblend : blend ); > + } > + ret = BitBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, > + info->hdcSrc, > + rect.left + (info->pptSrc ? info->pptSrc->x : 0), > + rect.top + (info->pptSrc ? info->pptSrc->y : 0), > + SRCCOPY ); BitBlt is not guaranteed to set a valid alpha channel. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: ntoskrnl.exe: add KeAcquireInStackQueuedSpinLock stub (resend)
by Austin English 07 Feb '17

07 Feb '17

Sorry, please ignore this one, I missed Sebastian's previous feedback. On Mon, Feb 6, 2017 at 5:12 PM, Austin English <austinenglish(a)gmail.com> wrote: > For https://bugs.winehq.org/show_bug.cgi?id=41472 > > -- > -Austin > GPG: 14FB D7EA A041 937B -- -Austin GPG: 14FB D7EA A041 937B

1 0

Re: [PATCH 2/4] shell32: Implement IShellImageData::Decode() when created from file path
by Alexandre Julliard 07 Feb '17

07 Feb '17

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > @@ -29,9 +29,17 @@ cpp_quote("#endif") > > cpp_quote("#ifndef _GDIPLUSHEADERS_H") > typedef BYTE EncoderParameters; > +cpp_quote("#endif") > + > +/* Wine does not define GDI+ class wrappers */ > +cpp_quote("#if defined(__WINESRC__) || !defined(_GDIPLUSHEADERS_H)") > typedef BYTE Image; > cpp_quote("#endif") We don't have C++ code in the Wine source, so I don't see why you'd need that. -- Alexandre Julliard julliard(a)winehq.org

2 4

Re: [PATCH 1/4] shell32: Added IShellImageData stub
by Alex Henrie 07 Feb '17

07 Feb '17

+static inline LPWSTR strdupW( LPCWSTR src ) +{ + LPWSTR dest; + if (!src) return NULL; + dest = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(src)+1)*sizeof(WCHAR) ); + if (dest) + lstrcpyW(dest, src); + return dest; +} I submitted a similar patch months ago and was told that I had to change LPWSTR to WCHAR * and consistently indent or not indent after these two if statements. -Alex

2 1

Re: [v4 2/3] ntdll: Implement FileIdInformation class support in NtQueryInformationFile.
by Marvin 07 Feb '17

07 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=28380 Your paranoid android. === wxppro (32 bit file) === file.c:1473: Test failed: can't get fid1, res c0000003 file.c:1479: Test failed: CreateFile error 2 file.c:1484: Test failed: can't get fid2, res c0000003 file.c:1496: Test failed: can't get new fid2, res c0000003 file.c:1499: Test failed: file id is not unique === w2003std (32 bit file) === file.c:1473: Test failed: can't get fid1, res c0000003 file.c:1479: Test failed: CreateFile error 2 file.c:1484: Test failed: can't get fid2, res c0000003 file.c:1496: Test failed: can't get new fid2, res c0000003 file.c:1499: Test failed: file id is not unique === wvistau64 (32 bit file) === file.c:1473: Test failed: can't get fid1, res c0000002 file.c:1479: Test failed: CreateFile error 2 file.c:1484: Test failed: can't get fid2, res c0000002 file.c:1496: Test failed: can't get new fid2, res c0000002 file.c:1499: Test failed: file id is not unique === w2008s64 (32 bit file) === file.c:1473: Test failed: can't get fid1, res c0000002 file.c:1479: Test failed: CreateFile error 2 file.c:1484: Test failed: can't get fid2, res c0000002 file.c:1496: Test failed: can't get new fid2, res c0000002 file.c:1499: Test failed: file id is not unique === w7u (32 bit file) === file.c:1473: Test failed: can't get fid1, res c0000003 file.c:1479: Test failed: CreateFile error 2 file.c:1484: Test failed: can't get fid2, res c0000003 file.c:1496: Test failed: can't get new fid2, res c0000003 file.c:1499: Test failed: file id is not unique === w7pro64 (32 bit file) === file.c:1473: Test failed: can't get fid1, res c0000002 file.c:1479: Test failed: CreateFile error 2 file.c:1484: Test failed: can't get fid2, res c0000002 file.c:1496: Test failed: can't get new fid2, res c0000002 file.c:1499: Test failed: file id is not unique === wvistau64 (64 bit file) === file.c:1473: Test failed: can't get fid1, res c0000003 file.c:1479: Test failed: CreateFile error 2 file.c:1484: Test failed: can't get fid2, res c0000003 file.c:1496: Test failed: can't get new fid2, res c0000003 file.c:1499: Test failed: file id is not unique === w2008s64 (64 bit file) === file.c:1473: Test failed: can't get fid1, res c0000003 file.c:1479: Test failed: CreateFile error 2 file.c:1484: Test failed: can't get fid2, res c0000003 file.c:1496: Test failed: can't get new fid2, res c0000003 file.c:1499: Test failed: file id is not unique === w7pro64 (64 bit file) === file.c:1473: Test failed: can't get fid1, res c0000003 file.c:1479: Test failed: CreateFile error 2 file.c:1484: Test failed: can't get fid2, res c0000003 file.c:1496: Test failed: can't get new fid2, res c0000003 file.c:1499: Test failed: file id is not unique

1 0

Re: dinput: Give correct count of devices still to be enumerated.
by Andrew Eikum 07 Feb '17

07 Feb '17

Thanks for working on this. The logic looks good, just some small comments in-line below. On Sat, Feb 04, 2017 at 03:35:10PM +0200, Jetro Jormalainen wrote: > diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c > index 06af92f9b2..05651c9ced 100644 > --- a/dlls/dinput/dinput_main.c > +++ b/dlls/dinput/dinput_main.c > @@ -930,7 +930,8 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( > LPDIRECTINPUTDEVICE8A lpdid; > DWORD callbackFlags; > int i, j; > - > + int c = 0; Please use a more descriptive variable name, like "count" or "total" or something. > + for (i=0; i < c; i++) > + { > + unsigned remain = c - (i+1) + ((dwFlags & DIEDBSFL_FORCEFEEDBACK) ? 0 : sizeof(guids)/sizeof(guids[0])); Please consistently use spaces around operators. If you wanted to make that line a little less ugly, you could assign "remain" before the loop and decrement it each iteration. > + callbackFlags = diactionformat_priorityA(lpdiActionFormat, lpdiActionFormat->dwGenre); > + IDirectInput_CreateDevice(iface, &didevis[i].guidInstance, &lpdid, NULL); > + > + if (lpCallback(&didevis[i], lpdid, callbackFlags, remain, pvRef) == DIENUM_STOP) > + { > + HeapFree(GetProcessHeap(), 0, (void*) didevis); > + return DI_OK; > + } > + } > + > + HeapFree(GetProcessHeap(), 0, (void*) didevis); > + There's no need for the explicit cast in HeapFree. All of the above also applies to the W-version, obviously. > + if (!data->device_count) { > + data->first_remaining = dwRemaining; > + } > + ok (dwRemaining == data->first_remaining - data->device_count, > + "enum semantics remaining devices is wrong, expected %d, had %d", > + data->first_remaining - data->device_count, dwRemaining); This ok() needs a newline at the end. Andrew

1 0

Re: [PATCH 01/2] dpnet/test: Share code between tests (resend)
by Erich E. Hoover 07 Feb '17

07 Feb '17

On Mon, Jan 30, 2017 at 12:05 AM, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/dpnet/tests/address.c | 28 +------- > dlls/dpnet/tests/client.c | 150 +-------------------------------------- > dlls/dpnet/tests/dpnet_private.h | 32 +++++++++ > dlls/dpnet/tests/server.c | 16 ++--- > ... I have never seen a "*_private.h" header in any of the other tests, though there are a small number of "*_test.h" headers. This instance might be _especially_ confusing since it would result in both a "./dlls/dpnet/dpnet_private.h" and a "./dlls/dpnet/tests/dpnet_private.h". The second patch looks reasonable to me, though you may wish for others to weigh in. Best, Erich

2 2

wine-1.8.7-rc1 Available
by Michael Stefaniuc 07 Feb '17

07 Feb '17

Hello guys, I have pushed wine-1.8.7-rc1 (with tag) to https://github.com/mstefani/wine-stable https://static-winehq.rhcloud.com/stable/ This will be the final release in the 1.8.x series. For the release I would follow the same process: one week for feedback followed by another rc if needed with the final release 3-4 days later. And now the interesting parts from the ANNOUNCE file: What's new in this release (see below for details): - Various bug fixes. - A few more cards added to the GPU description table. ---------------------------------------------------------------- Bugs fixed in 1.8.7 (total 39): 11808 winefile: broken horizontal scrolling 17196 Text Editor Cursor can be scrolled outside editor 19862 CodeCreatures crashes. 30355 DVDSubEdit 1.52 crashes on startup, broken TBM_SETRANGEMAX handling 30385 Multiple applications need support for shell32.SHGetKnownFolderPath KF_FLAG_DEFAULT_PATH option (Windows Live Essentials 2011 web installer, MediaMonkey 4.1.x in Vista+ mode) 31222 Hitman: Blood Money crashes when changing screen resolution 32682 Multiple .NET 4.0 applications fail to load the pen cursor (IDC_PEN, 32631, 0x7F77 missing) 33859 Visual Web Developer Express 2008 crashes when clicking "Browse" (bug in PropertySheet common control) 34127 FIFA 2000 demo crashes after 'Press Any Key' 34465 process hacker 2.31 crashes in toolbar code 35495 sharing violation and prompt for copy /B file1+file2 file1 37762 Runaway & Runaway 2: wrong colors 38207 Unreal Tournament 3 uninstaller fails when invoking from 'wine uninstaller' (removes wrong entries) 39268 x11drv: Can't store handle for display fd 39509 OneDrive for Business installer crashes in Win8 mode (user32.dll 'SetCoalescableTimer' stub missing) 39661 Font width incorrect in wineconsole 39714 Halo some sounds in cut scenes don't play 40112 kernel32:time regression 40243 Korg Nano editor USB MIDI driver won't install, requires Administrator Privileges 40247 Wine returns the loopback IP as first item in GetIpAddrTable causing some licensed programs to fail due to invalid MAC address 40845 Uninstaller does not remove missing applications from the list 40978 Wrong colors on i915 and similar GPUs in GTA Vice City 41001 64-bit Core Temp 1.x kernel driver 'ALSysIO.sys' crashes on unimplemented function ntoskrnl.exe.RtlUnwindEx 41055 "Texture ... does not have a drawable" on i915 with D3D8 41141 gcc6: d3drm build warnings 41218 curl 7.50: HTTPS fails with InitializeSecurityContext failed: SEC_E_INVALID_TOKEN 41252 Helldivers gives this error when trying to run on MacOS 41476 Cannot paste in WinAuth 3.5.1 (32-bit) 41508 Menu infinitely loops, the application hangs. 41572 Windows API crash (GetTimeZoneInformationForYear) 41599 Battle.net and Hearthstone play loud static when receiving messages 41732 wineconsole: changing to emacs mode requires restart 41733 wineconsole: crashes in emacs mode when pasting (Ctrl+Y) empty buffer 41898 ToCA Race Driver 3 needs ntoskrnl.exe.RtlCopyMemory 41909 Calling TBM_SETPOS after TBM_SETRANGEMIN/TBM_SETRANGEMAX does not draw slider control properly 42090 Highway Pursuit constantly emits loud noise when sound effects enabled 42110 regression: commit "xinput1_3 prefer builtin dll" aliens versus predator classic 2000 (steam) fails to launch 42187 Radeon R9 285 GPU incorrectly recognized 42211 redefinition of typedef 'REFERENCE_TIME' ---------------------------------------------------------------- Changes since 1.8.6: Adam Bolte (1): wined3d: Add GPU information for AMD FIJI. Alex Henrie (1): user32: Tell MENU_SuspendPopup which message to remove. Alexandre Julliard (3): winex11: Also ignore BadWindow errors caused by XSendEvent. wineconsole: Leave room for wide characters only when using a DBCS codepage. Update copyright info for 2017. Andrew Eikum (5): user32: Support IDC_PEN. dsound: Handle default case in dsound3d mode switch (Coverity). dsound: Use the value from SetVolume when 3D processing is disabled. msacm32: Support conversion from 24-bit PCM. dsound: Fix rolloff factor calculation. Austin English (1): ntoskrnl.exe: Forward RtlUnwindEx to ntdll. Brock York (1): msctf: Remove incorrect dereference of double pointer. Bruno Jesus (1): iphlpapi: Ensure GetIpAddrTable returns loopback addresses in the end. Carlos Rodriguez (1): wined3d: Recognize Geforce GTX 1050. Henri Verbeet (4): wined3d: Properly check for the required extensions before selecting the GLSL FFP implementations. d3drm: Introduce d3drm_set_color(). wined3d: Add GPU information for AMD TONGA. wine.inf: Add Dynamic DST data for Asia/Tehran. Hugh McMaster (4): kernel32: Check for a valid pointer before yanking the line. kernel32: Use Emacs keymap mode immediately after wineconsole configuration change. appwiz.cpl: Remove list entries left over from an earlier uninstall. appwiz.cpl: Do not overwrite application IDs when changing registry keys. Jacek Caban (2): winex11.drv: Added ThreadDetach entry point and use it instead of DllMain. secur32: Don't change input buffer in InitializeSecurityContext. Jarkko Korpi (2): wined3d: Add Amd Rx 480 binary driver. winex11.drv: Add 640x400 mode to virtual desktop. Józef Kucia (5): wined3d: Update "screen_format" when ChangeDisplaySettingsEx() call is redundant. d3d8/tests: Add more tests for UnlockRect(). d3d8: Return D3D_OK from UnlockRect() for not locked textures. d3d9/tests: Add test showing WM_SIZE is not sent during fullscreen mode change. wined3d: Filter messages for fullscreen mode changes. Lauri Kenttä (3): user32: Fix caret disappearing after scrolling. cmd: Fix copying when the dest is one of the sources. winefile: Fix horizontal scrolling. Louis Lenders (1): wine.inf: Add Drivers32 registry key. Matteo Bruni (3): wined3d: Also check BLENDWEIGHT for immediate mode fallback. d3d9/tests: Add a vertex blending test with D3DCOLOR weights. wined3d: Swizzle D3DCOLOR attributes in the GLSL FFP replacement when necessary. Michael Cronenworth (1): wined3d: Add Iris Haswell PCI ids and descriptions. Michael Stefaniuc (1): include: Make wine_dbgstr_rect() available for tests too. Nikolay Sivov (8): ntoskrnl: Added RtlCopyMemory() export. shell32: Move retrieving folder path logic to SHGetKnownFolderPath(). shell32: Don't access uninitialized buffer (Coverity). comctl32/tests: Trackbar test to show that thumb is updated on TBM_SETTICFREQ. comctl32/trackbar: Update thumb unconditionally on TBM_SETTICFREQ. comctl32/trackbar: Fix TBM_SETRANGEMAX handling when new limit is less than current min boundary. comctl32/toolbar: Protect from NULL pointer access in TB_GETBUTTONINFOW handler. comctl32/propsheet: Double size of a template buffer passed to PSCB_PRECREATE. Olivier F. R. Dierick (1): xinput1_3: Add DECLSPEC_HOTPATCH to XInputEnable() definition. Piotr Caban (1): user32: Test error returned in out of timers case. Sebastian Lackner (2): include: Avoid duplicate definition of REFERENCE_TIME. user32: Implement SetCoalescableTimer and add basic tests. Stefan Dösinger (1): d3d8/tests: Test invalid locks with textures. VRan Liu (1): shell32/tests: Simple test for KF_FLAG_DEFAULT_PATH. Vincent Povirk (3): kernel32/tests: Add tests for GetTimeZoneInformationForYear. kernel32: Implement GetTimeZoneInformationForYear. kernel32/tests: Avoid testing for a hard-coded timezone name. -- Michael Stefaniuc mstefani(a)winehq.org

2 2

Re: [PATCH v2 1/2] msvcrt/tests: Add tests for _creat.
by Piotr Caban 07 Feb '17

07 Feb '17

Hi, please fix the implementation in first patch and then add test in second. Currently the tests are using garbage data from stack causing random failures: file.c:2419: Test failed: expected read-only file file.c:2441: Test succeeded inside todo block: expected rw file Thanks, Piotr

2 1

Re: [PATCH] winejoystick.drv: add HID support
by Alexandre Julliard 07 Feb '17

07 Feb '17

Aric Stewart <aricstewart(a)gmail.com> writes: > Right now, only enabled if no other joystick platform layer is defined > or HID_WINMM is explicitly defined There shouldn't be any reason to ifdef it out, even when it's not used it should at least be built. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: d3d11: Silence a d3d11_immediate_context_OMSetBlendState fixme
by Henri Verbeet 07 Feb '17

07 Feb '17

On 6 February 2017 at 21:27, André Hentschel <nerv(a)dawncrow.de> wrote: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > > For https://bugs.winehq.org/show_bug.cgi?id=42017 > If you're a developer working on this code, and you're finding it hard to separate the FIXMEs that matter from the ones that don't, the correct way to do this would be to check "desc" for references to D3D11_BLEND_BLEND_FACTOR or D3D11_BLEND_INV_BLEND_FACTOR. But then, in that case it would be only marginally harder to just implement the functionality. For users uncomfortable with scary letters, I'd suggest WINEDEBUG=-all for a more thorough fix.

1 0

Re: [PATCH] iphlpapi: Implement AllocateAndGetTcpExTableFromStack (try 2).
by Hans Leidekker 07 Feb '17

07 Feb '17

On Mon, 2017-02-06 at 21:38 -0700, Erich E. Hoover wrote: > A variety of applications would like to see this function (Bug > #34372). This time without breaking the tests on XP/Win2k3... This export has been removed from Vista. Do these apps break if Wine is set to emulate Vista?

1 0

Re: [PATCH] iphlpapi: Implement AllocateAndGetTcpExTableFromStack.
by Marvin 07 Feb '17

07 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=28372 Your paranoid android. === wxppro (32 bit iphlpapi) === iphlpapi: unhandled exception c0000005 at 76D6F01F === w2003std (32 bit iphlpapi) === iphlpapi: unhandled exception c0000005 at 76CFFAD7

1 0

Re: [1/2] iphlpapi: Add GetUnicastIpAddressEntry implementation (try 3)
by Bruno Jesus 07 Feb '17

07 Feb '17

On Sun, Feb 5, 2017 at 7:25 PM, André Hentschel <nerv(a)dawncrow.de> wrote: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > > > For https://bugs.winehq.org/show_bug.cgi?id=41753 > try 2: Many thanks to Bruno and Hans for the feedback! > try 3: Proper patch numbering Thanks for the new patch ;-) I'm testing it now and I just have some doubts. > dlls/iphlpapi/iphlpapi.spec | 2 +- > dlls/iphlpapi/iphlpapi_main.c | 69 +++++++++++++++++++++++++++++++++++++++++++ > include/netioapi.h | 17 +++++++++++ > include/ws2def.h | 13 ++++++++ > include/ws2ipdef.h | 7 +++++ > 5 files changed, 107 insertions(+), 1 deletion(-) > > diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec > index 500267c..1a1f8f7 100644 > --- a/dlls/iphlpapi/iphlpapi.spec > +++ b/dlls/iphlpapi/iphlpapi.spec > @@ -147,7 +147,7 @@ > @ stub GetUdpStatsFromStack > @ stdcall GetUdpTable( ptr ptr long ) > @ stub GetUdpTableFromStack > -#@ stub GetUnicastIpAddressEntry > +@ stdcall GetUnicastIpAddressEntry( ptr ) > #@ stub GetUnicastIpAddressTable > @ stdcall GetUniDirectionalAdapterInfo( ptr ptr ) > @ stdcall Icmp6CreateFile() > diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c > index 1daf54d..cfa5d9d 100644 > --- a/dlls/iphlpapi/iphlpapi_main.c > +++ b/dlls/iphlpapi/iphlpapi_main.c > @@ -2467,6 +2467,75 @@ DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, > return ret; > } > > +DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW *row) > +{ > + char buf[MAX_ADAPTER_NAME], *name; > + DWORD ret = ERROR_FILE_NOT_FOUND; > + IP_ADAPTER_ADDRESSES *aa, *ptr; > + ULONG size = 0; > + > + TRACE("%p\n", row); > + > + if (!row) > + return ERROR_INVALID_PARAMETER; > + > + if ((!(name = getInterfaceNameByIndex( row->InterfaceIndex, buf )) && > + !(name = getInterfaceNameByIndex( row->InterfaceLuid.Info.NetLuidIndex, buf )))) > + return ERROR_FILE_NOT_FOUND; The second test for row->InterfaceLuid.Info.NetLuidIndex is really necessary? Because if I remove it the tests don't fail. Actually this is the main point, if I remove the whole if and add a ret = ERROR_FILE_NOT_FOUND before the for (like it was in v1) the tests also pass. > + ret = GetAdaptersAddresses(row->Address.si_family, 0, NULL, NULL, &size); > + if (ret != ERROR_BUFFER_OVERFLOW) > + return ret; > + if (!(ptr = HeapAlloc(GetProcessHeap(), 0, size))) > + return ERROR_OUTOFMEMORY; > + if ((ret = GetAdaptersAddresses(row->Address.si_family, 0, NULL, ptr, &size))) > + { > + HeapFree(GetProcessHeap(), 0, ptr); > + return ret; > + } > + > + for (aa = ptr; aa; aa = aa->Next) > + { > + IP_ADAPTER_UNICAST_ADDRESS *ua; > + > + if (aa->u.s.IfIndex != row->InterfaceIndex) > + continue; > + > + ret = ERROR_NOT_FOUND; > + > + ua = aa->FirstUnicastAddress; > + while (ua) > + { > + SOCKADDR_INET *uaaddr = (SOCKADDR_INET *)ua->Address.lpSockaddr; > + > + if ((row->Address.si_family == WS_AF_INET6 && !memcmp(&row->Address.Ipv6.sin6_addr, &uaaddr->Ipv6.sin6_addr, sizeof(row->Address.Ipv6.sin6_addr))) || > + (row->Address.si_family == WS_AF_INET && !memcmp(&row->Address.Ipv4.sin_addr, &uaaddr->Ipv4.sin_addr, sizeof(row->Address.Ipv4.sin_addr)))) I forgot this in v1 but this line is also too long, sorry. By the way, what about comparing the ipv4 directly (Ipv4.sin_addr.S_un.S_addr ==)?

1 0

Re: [PATCH] Some tests for lsa
by Bruno Jesus 06 Feb '17

06 Feb '17

On Sun, Feb 5, 2017 at 5:57 PM, Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> wrote: > --- > dlls/secur32/tests/Makefile.in | 1 + > dlls/secur32/tests/lsa.c | 215 +++++++++++++++++++++++++++++++++++++++++ > include/ntsecapi.h | 38 ++++++++ > 3 files changed, 254 insertions(+) > create mode 100644 dlls/secur32/tests/lsa.c Hi, thanks for the patch. Unfortunately as is it cannot be used. Somethings are stated below but mostly you have to check the compiler warnings and guarantee there is none. Also, although very minor, git apply complains about 7 lines adding trailing whitespaces. > diff --git a/dlls/secur32/tests/Makefile.in b/dlls/secur32/tests/Makefile.in > index 089d1c3..d9f140a 100644 > --- a/dlls/secur32/tests/Makefile.in > +++ b/dlls/secur32/tests/Makefile.in > @@ -2,6 +2,7 @@ TESTDLL = secur32.dll > IMPORTS = secur32 crypt32 advapi32 ws2_32 > > C_SRCS = \ > + lsa.c \ > main.c \ > negotiate.c \ > ntlm.c \ > diff --git a/dlls/secur32/tests/lsa.c b/dlls/secur32/tests/lsa.c > new file mode 100644 > index 0000000..6fa1564 > --- /dev/null > +++ b/dlls/secur32/tests/lsa.c > @@ -0,0 +1,215 @@ > +/* > + * Lsa tests The copyright line is missing, example: Copyright 2017 Julius Schwartzenberg > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > + */ > + > +#include <stdio.h> > +#include <windows.h> > +#include <ntsecapi.h> > +#define SECURITY_WIN32 > +#include <ntstatus.h> > +#include <winternl.h> Compiling the patch generates dozens of warnings due to duplicated definitions, please review the headers in use. > +#include "wine/test.h" > + > +static HMODULE secdll; This variable is basically not used anywhere, you don't load the DLL so there is no need to free it. > +char *package_name_kerberos = MICROSOFT_KERBEROS_NAME_A; Is this really necessary? Can't you use the define directly? > +static void test_LsaConnectUntrusted_null_handle(void) > +{ > + NTSTATUS status; > + > + status = LsaConnectUntrusted(NULL); > + > + todo_wine { > + ok(status == STATUS_ACCESS_VIOLATION || status == RPC_NT_NULL_REF_POINTER, > + "LsaConnectUntrusted(NULL) returned 0x%x\n", status); > + } > +} > + > +static void test_LsaConnectUntrsuted_correct_handle(void) > +{ > + NTSTATUS status; > + HANDLE lsa_handle; > + > + status = LsaConnectUntrusted(&lsa_handle); > + > + ok(status == STATUS_SUCCESS, "LsaConnectUntrusted(valid_handle) returned 0x%x\n", status); > +} You are leaking the handle, according to MSDN you need to call LsaDeregisterLogonProcess to close it. This applies to every function that calls this function. > +static void test_LsaLookupAuthenticationPackage_null_handle(void) > +{ > + NTSTATUS status; > + LSA_STRING package_name; > + ULONG auth_package; > + package_name.Buffer = package_name_kerberos; > + package_name.Length = (USHORT)strlen(package_name.Buffer); If you use the #define you can use sizeof(MICROSOFT_KERBEROS_NAME_A) - 1 instead of strlen since the buffer is constant. > + status = LsaLookupAuthenticationPackage(NULL, &package_name, &auth_package); > + > + todo_wine { > + ok(status == STATUS_INVALID_HANDLE || status == STATUS_INVALID_CONNECTION, > + "LsaLookupAuthenticationPackage(NULL, \"Kerberos\", ...) returned 0x%x\n", status); > + } No need for a block in the todo_wine since it is only one ok call. > +} > + > +static void test_LsaLookupAuthenticationPackage_correct_handle(void) > +{ > + NTSTATUS status; > + HANDLE lsa_handle; > + LSA_STRING package_name; > + ULONG auth_package; > + package_name.Buffer = package_name_kerberos; > + package_name.Length = (USHORT)strlen(package_name.Buffer); > + > + LsaConnectUntrusted(&lsa_handle); > + status = LsaLookupAuthenticationPackage(lsa_handle, &package_name, &auth_package); > + > + ok(status == STATUS_SUCCESS, > + "LsaLookupAuthenticationPackage(valid_handle, \"Kerberos\", ...) returned 0x%x\n", status); Is it possible to test that auth_package somehow? > +} > + > +static void test_LsaLookupAuthenticationPackage_correct_handle_wrong_name(void) > +{ > + NTSTATUS status; > + HANDLE lsa_handle; > + LSA_STRING package_name; > + ULONG auth_package; > + package_name.Buffer = "this is probably not a valid authentication package name"; > + package_name.Length = (USHORT)strlen(package_name.Buffer); > + > + LsaConnectUntrusted(&lsa_handle); > + status = LsaLookupAuthenticationPackage(lsa_handle, &package_name, &auth_package); > + > + todo_wine { > + ok(status == STATUS_NO_SUCH_PACKAGE, > + "LsaLookupAuthenticationPackage(valid_handle, invalid, ...) returned 0x%x\n", status); > + } > +} > + > +static void test_LsaCallAuthenticationPackage_invalid_handle(void) > +{ > + NTSTATUS status; > + ULONG submit_buffer_length = 0; > + > + VOID *protocol_return_buffer; > + ULONG *return_buffer_length; > + PNTSTATUS protocol_status; > + > + status = LsaCallAuthenticationPackage( > + NULL, 0xdeadbeef, NULL, submit_buffer_length, > + protocol_return_buffer, return_buffer_length, protocol_status > + ); > + > + todo_wine { > + ok(status == STATUS_INVALID_HANDLE || status == STATUS_INVALID_CONNECTION, > + "LsaCallAuthenticationPackage(NULL, ...) returned 0x%x\n", status); > + } > +} > + > +static void test_LsaCallAuthenticationPackage_invalid_package(void) > +{ > + NTSTATUS status; > + HANDLE lsa_handle; > + ULONG submit_buffer_length = 0; > + > + VOID *protocol_return_buffer; > + ULONG *return_buffer_length; > + PNTSTATUS protocol_status; > + > + LsaConnectUntrusted(&lsa_handle); > + status = LsaCallAuthenticationPackage( > + lsa_handle, 0xdeadbeef, NULL, submit_buffer_length, > + protocol_return_buffer, return_buffer_length, protocol_status > + ); Bad parameters passed to the function, see compiler warnings. > + > + todo_wine { > + ok(status == STATUS_NO_SUCH_PACKAGE, > + "LsaCallAuthenticationPackage(valid_handle, invalid, ...) returned 0x%x\n", status); > + } > +} > + > +static void test_LsaCallAuthenticationPackage_null_submit_buffer(void) > +{ > + NTSTATUS status; > + HANDLE lsa_handle; > + LSA_STRING package_name; > + ULONG auth_package; > + package_name.Buffer = package_name_kerberos; > + package_name.Length = (USHORT)strlen(package_name.Buffer); > + ULONG submit_buffer_length = 0; Very specific compiler warning that you can't declare variables after code. > + > + VOID *protocol_return_buffer; > + ULONG *return_buffer_length; > + PNTSTATUS protocol_status; > + > + LsaConnectUntrusted(&lsa_handle); > + LsaLookupAuthenticationPackage(lsa_handle, &package_name, &auth_package); > + status = LsaCallAuthenticationPackage( > + lsa_handle, auth_package, NULL, submit_buffer_length, > + protocol_return_buffer, return_buffer_length, protocol_status > + ); Bad parameters passed to the function, see compiler warnings. > + todo_wine { > + ok(status == STATUS_INVALID_PARAMETER, > + "LsaCallAuthenticationPackage(...) returned 0x%x\n", status); > + } > +} > + > +static void test_LsaCallAuthenticationPackage_correct_submit_buffer(void) > +{ > + NTSTATUS status; > + HANDLE lsa_handle; > + LSA_STRING package_name; > + ULONG auth_package; > + package_name.Buffer = package_name_kerberos; > + package_name.Length = (USHORT)strlen(package_name.Buffer); > + PKERB_RETRIEVE_TKT_REQUEST protocol_submit_buffer; > + > + VOID *protocol_return_buffer; > + ULONG *return_buffer_length; > + PNTSTATUS protocol_status; > + > + LsaConnectUntrusted(&lsa_handle); > + LsaLookupAuthenticationPackage(lsa_handle, &package_name, &auth_package); > + > + protocol_submit_buffer = LocalAlloc(LMEM_ZEROINIT, sizeof(KERB_RETRIEVE_TKT_REQUEST)); > + protocol_submit_buffer->MessageType = KerbRetrieveEncodedTicketMessage; > + > + status = LsaCallAuthenticationPackage( > + lsa_handle, auth_package, protocol_submit_buffer, sizeof(KERB_RETRIEVE_TKT_REQUEST), > + protocol_return_buffer, return_buffer_length, protocol_status > + ); > + > + ok(status == STATUS_SUCCESS, "LsaCallAuthenticationPackage(...) returned 0x%x\n", status); > +} > + > +START_TEST(lsa) > +{ > + test_LsaConnectUntrusted_null_handle(); > + test_LsaConnectUntrsuted_correct_handle(); Untrusted misspelling. > + test_LsaLookupAuthenticationPackage_null_handle(); > + test_LsaLookupAuthenticationPackage_correct_handle(); > + test_LsaLookupAuthenticationPackage_correct_handle_wrong_name(); > + test_LsaCallAuthenticationPackage_invalid_handle(); > + test_LsaCallAuthenticationPackage_invalid_package(); > + test_LsaCallAuthenticationPackage_null_submit_buffer(); > + test_LsaCallAuthenticationPackage_correct_submit_buffer(); > + > + if(secdll) > + FreeLibrary(secdll); As I said earlier this is not required. > +} > diff --git a/include/ntsecapi.h b/include/ntsecapi.h > index 2bb3d31..439f67e 100644 > --- a/include/ntsecapi.h > +++ b/include/ntsecapi.h > @@ -387,6 +387,44 @@ NTSTATUS WINAPI LsaSetTrustedDomainInformation(LSA_HANDLE,PSID,TRUSTED_INFORMATI > NTSTATUS WINAPI LsaStorePrivateData(LSA_HANDLE,PLSA_UNICODE_STRING,PLSA_UNICODE_STRING); > NTSTATUS WINAPI LsaUnregisterPolicyChangeNotification(POLICY_NOTIFICATION_INFORMATION_CLASS,HANDLE); > > +#ifndef MICROSOFT_KERBEROS_NAME_A > + > +#define MICROSOFT_KERBEROS_NAME_A "Kerberos" > +#define MICROSOFT_KERBEROS_NAME_W L"Kerberos" You can't use L to define WCHAR data. > +#ifdef WIN32_CHICAGO Where is this from? Not a single Wine header has that name. > +#define MICROSOFT_KERBEROS_NAME MICROSOFT_KERBEROS_NAME_A > +#else > +#define MICROSOFT_KERBEROS_NAME MICROSOFT_KERBEROS_NAME_W > +#endif > +#endif > + > +typedef enum _KERB_PROTOCOL_MESSAGE_TYPE { > + KerbDebugRequestMessage = 0,KerbQueryTicketCacheMessage,KerbChangeMachinePasswordMessage,KerbVerifyPacMessage,KerbRetrieveTicketMessage, > + KerbUpdateAddressesMessage,KerbPurgeTicketCacheMessage,KerbChangePasswordMessage,KerbRetrieveEncodedTicketMessage,KerbDecryptDataMessage, > + KerbAddBindingCacheEntryMessage,KerbSetPasswordMessage,KerbSetPasswordExMessage,KerbVerifyCredentialsMessage,KerbQueryTicketCacheExMessage, > + KerbPurgeTicketCacheExMessage,KerbRefreshSmartcardCredentialsMessage,KerbAddExtraCredentialsMessage,KerbQuerySupplementalCredentialsMessage, > + KerbTransferCredentialsMessage,KerbQueryTicketCacheEx2Message These lines are too long, try to keep around 100 columns. > +} KERB_PROTOCOL_MESSAGE_TYPE,*PKERB_PROTOCOL_MESSAGE_TYPE; > + > +#ifndef __SECHANDLE_DEFINED__ > + typedef struct _SecHandle { > + ULONG_PTR dwLower; > + ULONG_PTR dwUpper; > + } SecHandle,*PSecHandle; > + > +#define __SECHANDLE_DEFINED__ > +#endif > + > +typedef struct _KERB_RETRIEVE_TKT_REQUEST { > + KERB_PROTOCOL_MESSAGE_TYPE MessageType; > + LUID LogonId; > + UNICODE_STRING TargetName; > + ULONG TicketFlags; > + ULONG CacheOptions; > + LONG EncryptionType; > + SecHandle CredentialsHandle; > +} KERB_RETRIEVE_TKT_REQUEST,*PKERB_RETRIEVE_TKT_REQUEST; > + > #ifdef __cplusplus > } /* extern "C" */ > #endif /* defined(__cplusplus) */ > -- > 1.9.1 > > >

2 1

Re: [v3 2/3] ntdll: Implement FileIdInformation class support in NtQueryInformationFile.
by Marvin 06 Feb '17

06 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=28366 Your paranoid android. === wxppro (32 bit file) === file.c:1466: Test failed: can't get fid1, res c0000003 file.c:1478: Test failed: can't get fid2, res c0000003 file.c:1491: Test failed: can't get new fid2, res c0000003 file.c:1494: Test failed: file id is not unique === w2003std (32 bit file) === file.c:1466: Test failed: can't get fid1, res c0000003 file.c:1478: Test failed: can't get fid2, res c0000003 file.c:1491: Test failed: can't get new fid2, res c0000003 file.c:1494: Test failed: file id is not unique === wvistau64 (32 bit file) === file.c:1466: Test failed: can't get fid1, res c0000002 file.c:1478: Test failed: can't get fid2, res c0000002 file.c:1491: Test failed: can't get new fid2, res c0000002 file.c:1494: Test failed: file id is not unique === w2008s64 (32 bit file) === file.c:1466: Test failed: can't get fid1, res c0000002 file.c:1478: Test failed: can't get fid2, res c0000002 file.c:1491: Test failed: can't get new fid2, res c0000002 file.c:1494: Test failed: file id is not unique === w7u (32 bit file) === file.c:1466: Test failed: can't get fid1, res c0000003 file.c:1478: Test failed: can't get fid2, res c0000003 file.c:1491: Test failed: can't get new fid2, res c0000003 file.c:1494: Test failed: file id is not unique === w7pro64 (32 bit file) === file.c:1466: Test failed: can't get fid1, res c0000002 file.c:1478: Test failed: can't get fid2, res c0000002 file.c:1491: Test failed: can't get new fid2, res c0000002 file.c:1494: Test failed: file id is not unique === wvistau64 (64 bit file) === file.c:1466: Test failed: can't get fid1, res c0000003 file.c:1478: Test failed: can't get fid2, res c0000003 file.c:1491: Test failed: can't get new fid2, res c0000003 file.c:1494: Test failed: file id is not unique === w2008s64 (64 bit file) === file.c:1466: Test failed: can't get fid1, res c0000003 file.c:1478: Test failed: can't get fid2, res c0000003 file.c:1491: Test failed: can't get new fid2, res c0000003 file.c:1494: Test failed: file id is not unique === w7pro64 (64 bit file) === file.c:1466: Test failed: can't get fid1, res c0000003 file.c:1478: Test failed: can't get fid2, res c0000003 file.c:1491: Test failed: can't get new fid2, res c0000003 file.c:1494: Test failed: file id is not unique

1 0

Re: [v3 1/3] ntdll: Define more file information classes.
by Marvin 06 Feb '17

06 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=28365 Your paranoid android. === wxppro (32 bit directory) === directory.c:369: Test failed: 60: wrong status c0000003 directory.c:369: Test failed: 63: wrong status c0000003 === w2003std (32 bit directory) === directory.c:369: Test failed: 60: wrong status c0000003 directory.c:369: Test failed: 63: wrong status c0000003 === wvistau64 (32 bit directory) === directory.c:369: Test failed: 60: wrong status c0000002 directory.c:369: Test failed: 63: wrong status c0000002 === w2008s64 (32 bit directory) === directory.c:369: Test failed: 60: wrong status c0000002 directory.c:369: Test failed: 63: wrong status c0000002 === w7u (32 bit directory) === directory.c:369: Test failed: 60: wrong status c0000003 directory.c:369: Test failed: 63: wrong status c0000003 === w7pro64 (32 bit directory) === directory.c:369: Test failed: 60: wrong status c0000002 directory.c:369: Test failed: 63: wrong status c0000002 === w864 (32 bit directory) === directory.c:369: Test failed: 63: wrong status c0000002 === wvistau64 (64 bit directory) === directory.c:369: Test failed: 60: wrong status c0000003 directory.c:369: Test failed: 63: wrong status c0000003 === w2008s64 (64 bit directory) === directory.c:369: Test failed: 60: wrong status c0000003 directory.c:369: Test failed: 63: wrong status c0000003 === w7pro64 (64 bit directory) === directory.c:369: Test failed: 60: wrong status c0000003 directory.c:369: Test failed: 63: wrong status c0000003

1 0

Re: [PATCH 1/2] msvcrt/tests: Add tests for _creat.
by Lauri Kenttä 06 Feb '17

06 Feb '17

On 2017-02-06 19:54, Piotr Caban wrote: > On 02/06/17 18:27, Lauri Kenttä wrote: >> + int fd, pos, count, readonly, old_fmode = _fmode; > This will not compile in 64-bit wine. Please use e.g. > __p__fmode instead of _fmode. > > Thanks, > Piotr Thanks. __p__fmode doesn't seem to work on 64-bit either. What a mess. Resubmitted with _get_fmode/_set_fmode. I'm not sure if those should be used without GetProcAddress, but at least MinGW has unresolved symbols. Whatever, at least it's working now on both 32-bit and 64-bit. :) -- Lauri Kenttä

1 0

Re: [PATCH 2/2] msvcrt: Fix _creat and _wcreat.
by Marvin 06 Feb '17

06 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=28359 Your paranoid android. === wvistau64 (64 bit file) === file.c:2416: Test failed: expected pos 4 (binary mode), got 6 === w2008s64 (64 bit file) === file.c:2416: Test failed: expected pos 4 (binary mode), got 6 === w7pro64 (64 bit file) === file.c:2416: Test failed: expected pos 4 (binary mode), got 6 === w864 (64 bit file) === file.c:2416: Test failed: expected pos 4 (binary mode), got 6 === w1064 (64 bit file) === file.c:2416: Test failed: expected pos 4 (binary mode), got 6

1 0

Re: [PATCH] msvcrt: Pass a missing flag to MSVCRT__open.
by Piotr Caban 06 Feb '17

06 Feb '17

On 02/04/17 14:15, Lauri Kenttä wrote: > int CDECL MSVCRT__creat(const char *path, int flags) > { > int usedFlags = (flags & MSVCRT__O_TEXT)| MSVCRT__O_CREAT| MSVCRT__O_WRONLY| MSVCRT__O_TRUNC; > - return MSVCRT__open(path, usedFlags); > + return MSVCRT__open(path, usedFlags, MSVCRT__S_IWRITE); > } According to MSDN the function takes pmode as second argument. Could you please add some tests for it? It looks like wine's implementation is handling second argument incorrectly. Thanks, Piotr

2 1

Re: [PATCH 1/2] msvcrt/tests: Add tests for _creat.
by Marvin 06 Feb '17

06 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=28358 Your paranoid android. === wvistau64 (64 bit file) === file.c:2417: Test failed: expected pos 4 (binary mode), got 6 === w2008s64 (64 bit file) === file.c:2417: Test failed: expected pos 4 (binary mode), got 6 === w7pro64 (64 bit file) === file.c:2417: Test failed: expected pos 4 (binary mode), got 6 === w864 (64 bit file) === file.c:2417: Test failed: expected pos 4 (binary mode), got 6 === w1064 (64 bit file) === file.c:2417: Test failed: expected pos 4 (binary mode), got 6

1 0

Re: [PATCH 2/2] msvcrt: Check pmode in _wsopen_dispatch.
by Piotr Caban 06 Feb '17

06 Feb '17

Hi Lauri, On 02/04/17 15:38, Lauri Kenttä wrote: > if (oflags & MSVCRT__O_CREAT) > { > - if(pmode & ~(MSVCRT__S_IREAD | MSVCRT__S_IWRITE)) > - FIXME(": pmode 0x%04x ignored\n", pmode); > + if (secure && !MSVCRT_CHECK_PMT(!(pmode & ~(MSVCRT__S_IREAD | MSVCRT__S_IWRITE)))) > + return MSVCRT_EINVAL; According to my testing pmode validation doesn't depend on secure flag value (I've tested _wsopen function in msvcr90, I didn't test the _wsopen_dispatch function). Thanks, Piotr

2 2

winmm: deferred patches
by Carlo Bramini 06 Feb '17

06 Feb '17

Hello friends, I had sent two little patches that they were deferred, I do not know if it was because the code freeze or something else: https://www.winehq.org/pipermail/wine-patches/2016-December/156556.html https://www.winehq.org/pipermail/wine-patches/2016-December/156558.html I was wondering if I have to resend them or somebody could just apply them, since they are so small and if you think that they could be useful. Sincerely, Carlo Bramini.

2 1

Re: [PATCH 1/2] wined3d: Add patch primitives.
by Henri Verbeet 06 Feb '17

06 Feb '17

On 2 February 2017 at 19:45, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > @@ -72,6 +72,38 @@ enum wined3d_primitive_type > WINED3D_PT_LINESTRIP_ADJ = 11, > WINED3D_PT_TRIANGLELIST_ADJ = 12, > WINED3D_PT_TRIANGLESTRIP_ADJ = 13, > + WINED3D_PT_1_CONTROL_POINT_PATCHLIST = 33, > + WINED3D_PT_2_CONTROL_POINT_PATCHLIST = 34, > + WINED3D_PT_3_CONTROL_POINT_PATCHLIST = 35, > + WINED3D_PT_4_CONTROL_POINT_PATCHLIST = 36, > + WINED3D_PT_5_CONTROL_POINT_PATCHLIST = 37, > + WINED3D_PT_6_CONTROL_POINT_PATCHLIST = 38, > + WINED3D_PT_7_CONTROL_POINT_PATCHLIST = 39, > + WINED3D_PT_8_CONTROL_POINT_PATCHLIST = 40, > + WINED3D_PT_9_CONTROL_POINT_PATCHLIST = 41, > + WINED3D_PT_10_CONTROL_POINT_PATCHLIST = 42, > + WINED3D_PT_11_CONTROL_POINT_PATCHLIST = 43, > + WINED3D_PT_12_CONTROL_POINT_PATCHLIST = 44, > + WINED3D_PT_13_CONTROL_POINT_PATCHLIST = 45, > + WINED3D_PT_14_CONTROL_POINT_PATCHLIST = 46, > + WINED3D_PT_15_CONTROL_POINT_PATCHLIST = 47, > + WINED3D_PT_16_CONTROL_POINT_PATCHLIST = 48, > + WINED3D_PT_17_CONTROL_POINT_PATCHLIST = 49, > + WINED3D_PT_18_CONTROL_POINT_PATCHLIST = 50, > + WINED3D_PT_19_CONTROL_POINT_PATCHLIST = 51, > + WINED3D_PT_20_CONTROL_POINT_PATCHLIST = 52, > + WINED3D_PT_21_CONTROL_POINT_PATCHLIST = 53, > + WINED3D_PT_22_CONTROL_POINT_PATCHLIST = 54, > + WINED3D_PT_23_CONTROL_POINT_PATCHLIST = 55, > + WINED3D_PT_24_CONTROL_POINT_PATCHLIST = 56, > + WINED3D_PT_25_CONTROL_POINT_PATCHLIST = 57, > + WINED3D_PT_26_CONTROL_POINT_PATCHLIST = 58, > + WINED3D_PT_27_CONTROL_POINT_PATCHLIST = 59, > + WINED3D_PT_28_CONTROL_POINT_PATCHLIST = 60, > + WINED3D_PT_29_CONTROL_POINT_PATCHLIST = 61, > + WINED3D_PT_30_CONTROL_POINT_PATCHLIST = 62, > + WINED3D_PT_31_CONTROL_POINT_PATCHLIST = 63, > + WINED3D_PT_32_CONTROL_POINT_PATCHLIST = 64, > }; > I'm not sure this really makes sense in wined3d, in OpenGL the primitive type and control point count are separate.

2 2

Re: [PATCH 2/2] wined3d: Add support for SRCCOLOR1, INVSRCCOLOR1, SRCALPHA1 and INVSRCALPHA1 blend modes.
by Henri Verbeet 06 Feb '17

06 Feb '17

On 4 February 2017 at 12:33, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > > Overrides http://source.winehq.org/patches/data/129692 > > Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> > --- > dlls/wined3d/state.c | 8 ++++++++ > include/wine/wined3d.h | 4 ++++ > 2 files changed, 12 insertions(+) > The naming is better in this revision, but it looks like Thunderbird corrupted the patch.

1 0

Re: [PATCH 2/2] user32: Implement BS_SPLITBUTTON and BS_DEFSPLITBUTTON.
by Nikolay Sivov 06 Feb '17

06 Feb '17

On 06.02.2017 3:54, Shu Yokoyama wrote: > Signed-off-by: Shu Yokoyama <yokoyama(a)graco.c.u-tokyo.ac.jp> > --- > dlls/user32/button.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++---- > 1 file changed, 142 insertions(+), 10 deletions(-) > > diff --git a/dlls/user32/button.c b/dlls/user32/button.c > index e85e30d..135fb1b 100644 > --- a/dlls/user32/button.c > +++ b/dlls/user32/button.c > @@ -29,6 +29,8 @@ > * > * TODO > * Styles > + * - BS_COMMANDLINK > + * - BS_DEFCOMMANDLINK > * - BS_NOTIFY: is it complete? > * - BS_RIGHTBUTTON: same as BS_LEFTTEXT > * > @@ -42,6 +44,8 @@ > * - BCM_GETTEXTMARGIN > * - BCM_SETIMAGELIST > * - BCM_SETTEXTMARGIN > + * - BCM_SETSPLITINFO > + * - BCM_GETSPLITINFO > * > * Notifications > * - BCN_HOTITEMCHANGE > @@ -61,6 +65,8 @@ > * - Button_GetTextMargin > * - Button_SetImageList > * - Button_SetTextMargin > + * - Button_SetSplitInfo > + * - Button_GetSplitInfo > */ > > #include <stdarg.h> > @@ -73,6 +79,7 @@ > #include "winbase.h" > #include "wingdi.h" > #include "controls.h" > +#include "commctrl.h" > #include "win.h" > #include "user_private.h" > #include "wine/debug.h" > @@ -101,6 +108,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(button); > Hi. Patch has its own problems, but more importantly, that's not the way we want v6 controls to be implemented. We need proper separation between user32 and comctl32, with corresponding versioned classes being registered at the right time, and proper classes used based on current context.

2 3

Re: [v2 PATCH 2/3] user32/button: Use current button font to clear during WM_SETTEXT
by Dmitry Timoshkov 06 Feb '17

06 Feb '17

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > @@ -394,7 +395,9 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, > > GetClientRect(hWnd, &client); > rc = client; > + if ((hFont = get_button_font(hWnd))) hPrevFont = SelectObject(hdc, hFont); > BUTTON_CalcLabelRect(hWnd, hdc, &rc); > + if (hPrevFont) SelectObject(hdc, hPrevFont); BUTTON_CalcLabelRect() handles all styles of buttons, there is no reason to penalize every of them, only BS_TEXT style needs to have a proper font selected. -- Dmitry.

1 0

Re: [v2 PATCH 1/3] user32/button: Do not restore font after button has been painted
by Dmitry Timoshkov 06 Feb '17

06 Feb '17

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > + /* Test that original font is not selected back after painting */ > + hdc = CreateCompatibleDC(0); > + > + prevfont = SelectObject(hdc, hfont2); > + SendMessageA(hwnd, WM_PRINTCLIENT, (WPARAM)hdc, 0); > + ok(zfont == GetCurrentObject(hdc, OBJ_FONT), "button[%u]: unexpected font selected after WM_PRINTCLIENT %p, " > + "expected %p\n", i, GetCurrentObject(hdc, OBJ_FONT), zfont); The test works by a pure luck. It should check current dc font against prevfont instead of zfont. Changing zfont to DEFAULT_GUI_FONT makes the test fail because of that mistake. > + prevfont = SelectObject(hdc, hfont2); > + SendMessageA(hwnd, WM_PAINT, (WPARAM)hdc, 0); > + ok(zfont == GetCurrentObject(hdc, OBJ_FONT), "button[%u]: unexpected font selected after WM_PAINT %p, " > + "expected %p\n", i, GetCurrentObject(hdc, OBJ_FONT), zfont); Same here. -- Dmitry.

1 0

Re: [PATCH 3/3] user32: Fix groupbox rectangle calculation in the button's WM_SETTEXT handler.
by Dmitry Timoshkov 06 Feb '17

06 Feb '17

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > + /* FIXME: check other BS_* handlers */ > + if (btn_type == BS_GROUPBOX) > + InflateRect(&rc, -7, 1); /* GB_Paint does this */ How about doing what FIXME suggests? Adding some tests wouldn't hurt either. -- Dmitry.

3 5

Re: kernel32/tests: Add test for SetFileTime
by Marvin 06 Feb '17

06 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=28348 Your paranoid android. === w7u (32 bit file) === file.c:4321: Test failed: SetFileValidData failed 87 file.c:4324: Test failed: SetFileValidData failed 87

1 0

Re: [PATCH 1/3] user32: Always restore previously selected font in the button painting helpers.
by Nikolay Sivov 06 Feb '17

06 Feb '17

This is broken, I'll resend a fixed one.

1 0

Re: iphlpapi/tests: Add tests for GetUnicastIpAddressEntry (try 2)
by Marvin 05 Feb '17

05 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=28340 Your paranoid android. === build (build) === Make failed

1 0

Re: [v3 2/3] ntdll: Save rdi and rsi in raise_func_trampoline.
by Sebastian Lackner 05 Feb '17

05 Feb '17

On 05.02.2017 07:10, Andrew Wesie wrote: > On Windows, RDI and RSI are callee-saved registers, but on Linux > they are caller-saved registers. As such, raise_func_trampoline > needs to explicitly unwind them. > > Signed-off-by: Andrew Wesie <awesie(a)gmail.com> > --- > dlls/ntdll/signal_x86_64.c | 12 +++++++++--- > dlls/ntdll/tests/exception.c | 42 ++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 51 insertions(+), 3 deletions(-) > > diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c > index af16cfd..8b85be7 100644 > --- a/dlls/ntdll/signal_x86_64.c > +++ b/dlls/ntdll/signal_x86_64.c > @@ -2067,9 +2067,11 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) > extern void raise_func_trampoline( EXCEPTION_RECORD *rec, CONTEXT *context, raise_func func ); > __ASM_GLOBAL_FUNC( raise_func_trampoline, > __ASM_CFI(".cfi_signal_frame\n\t") > - __ASM_CFI(".cfi_def_cfa %rbp,144\n\t") /* red zone + rip + rbp */ > - __ASM_CFI(".cfi_rel_offset %rip,8\n\t") > - __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") > + __ASM_CFI(".cfi_def_cfa %rbp,160\n\t") /* red zone + rip + rbp + rdi + rsi */ > + __ASM_CFI(".cfi_rel_offset %rip,24\n\t") > + __ASM_CFI(".cfi_rel_offset %rbp,16\n\t") > + __ASM_CFI(".cfi_rel_offset %rdi,8\n\t") > + __ASM_CFI(".cfi_rel_offset %rsi,0\n\t") > "call *%rdx\n\t" > "int $3") > > @@ -2086,6 +2088,8 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun > { > CONTEXT context; > EXCEPTION_RECORD rec; > + ULONG64 rsi; > + ULONG64 rdi; > ULONG64 rbp; > ULONG64 rip; > ULONG64 red_zone[16]; > @@ -2155,6 +2159,8 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun > rsp_ptr = (ULONG64 *)RSP_sig(sigcontext) - 16; > *(--rsp_ptr) = RIP_sig(sigcontext); > *(--rsp_ptr) = RBP_sig(sigcontext); > + *(--rsp_ptr) = RDI_sig(sigcontext); > + *(--rsp_ptr) = RSI_sig(sigcontext); Good catch! > > /* now modify the sigcontext to return to the raise function */ > RIP_sig(sigcontext) = (ULONG_PTR)raise_func_trampoline; > diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c > index dc8f1e2..80c22d0 100644 > --- a/dlls/ntdll/tests/exception.c > +++ b/dlls/ntdll/tests/exception.c > @@ -2073,6 +2073,47 @@ static DWORD run_exception_test(void *handler, const void* context, > return result; > } > > +static DWORD WINAPI unwind_rdi_rsi_handler( EXCEPTION_RECORD *rec, ULONG64 frame, > + CONTEXT *context, DISPATCHER_CONTEXT *dispatcher ) > +{ > + if (rec->ExceptionCode != STATUS_BREAKPOINT) > + return ExceptionContinueSearch; > + > + RtlUnwind( (PVOID)context->Rsp, (PVOID)(context->Rip + 1), rec, NULL ); Is it safe to assume that this will always work? Unwinding past the unwind_rdi_rsi_handler function might require unwinding information, but I'm not sure if we have that when compiling with mingw? I thought this was not implemented yet. On the testbot it still passed, probably because it was luckily compiled to a simple leaf function. > + return ExceptionContinueSearch; > +} > + > +static const BYTE unwind_rdi_test_code[] = { > + 0x57, /* push %rdi */ > + 0x48, 0xc7, 0xc7, 0x55, 0x55, 0x55, 0x55, /* mov $0x55555555, %rdi */ > + 0xcc, /* int3 */ > + 0x48, 0x89, 0xf8, /* mov %rdi, %rax */ > + 0x5f, /* pop %rdi */ > + 0xc3, /* ret */ > +}; > + > +static const BYTE unwind_rsi_test_code[] = { > + 0x56, /* push %rsi */ > + 0x48, 0xc7, 0xc6, 0x33, 0x33, 0x33, 0x33, /* mov $0x33333333, %rsi */ > + 0xcc, /* int3 */ > + 0x48, 0x89, 0xf0, /* mov %rsi, %rax */ > + 0x5e, /* pop %rsi */ > + 0xc3, /* ret */ > +}; > + > +static void test_unwind_rdi_rsi(void) > +{ > + DWORD result; > + > + result = run_exception_test(unwind_rdi_rsi_handler, NULL, unwind_rdi_test_code, > + sizeof(unwind_rdi_test_code), 0); > + ok( result == 0x55555555, "expected %x, got %x\n", 0x55555555, result ); > + > + result = run_exception_test(unwind_rdi_rsi_handler, NULL, unwind_rsi_test_code, > + sizeof(unwind_rsi_test_code), 0); > + ok( result == 0x33333333, "expected %x, got %x\n", 0x33333333, result ); > +} > + > static DWORD WINAPI dr7_handler( EXCEPTION_RECORD *rec, ULONG64 frame, > CONTEXT *context, DISPATCHER_CONTEXT *dispatcher ) > { > @@ -2651,6 +2692,7 @@ START_TEST(exception) > test_virtual_unwind(); > test___C_specific_handler(); > test_restore_context(); > + test_unwind_rdi_rsi(); > > if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) > test_dynamic_unwind(); >

1 0

Re: [v3 1/3] ntdll: Set Dr7 when saving context.
by Sebastian Lackner 05 Feb '17

05 Feb '17

On 05.02.2017 07:10, Andrew Wesie wrote: > This is a work-around so that Dr7 is initialized to a reasonable value. Before > it was just uninitialized memory. The test will fail without the work-around, > and shows a todo if Dr7 is zero. > > Signed-off-by: Andrew Wesie <awesie(a)gmail.com> > --- > dlls/ntdll/signal_x86_64.c | 1 + > dlls/ntdll/tests/exception.c | 121 +++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 122 insertions(+) > > diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c > index f33fe4c..af16cfd 100644 > --- a/dlls/ntdll/signal_x86_64.c > +++ b/dlls/ntdll/signal_x86_64.c > @@ -1692,6 +1692,7 @@ static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) > context->u.FltSave = *FPU_sig(sigcontext); > context->MxCsr = context->u.FltSave.MxCsr; > } > + context->Dr7 = 0; > } > > Wouldn't it make more sense to add a proper implementation for all debug registers? We already have the signal_i386 code for an example how to do it, and other functions like NtGetContextThread also support querying the debug registers (even on x86_64). Best regards, Sebastian

2 2

Re: [v2 2/3] ntdll: Save rdi and rsi in raise_func_trampoline.
by Marvin 05 Feb '17

05 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=28326 Your paranoid android. === build (build) === Make failed

1 0

Re: [v2 1/3] ntdll: Set Dr7 when saving context.
by Marvin 05 Feb '17

05 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=28325 Your paranoid android. === build (build) === Make failed

1 0

GSoC Ideas page
by André Hentschel 04 Feb '17

04 Feb '17

Hi, I just did the GSoC 2017 application for Wine, please update https://wiki.winehq.org/Summer_Of_Code with your Ideas and mention yourself as possible mentor where appropriate. Thanks!

3 2

Re: [3/3] wined3d: Upload textures if NO_DIRTY_UPDATE flag is set when locking dynamic textures.
by Marvin 04 Feb '17

04 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=28316 Your paranoid android. === w1064 (32 bit visual) === visual.c:7989: Test failed: Got unexpected color 0x00007580 for quad 2 (different colors). visual.c:8093: Test failed: Got unexpected color 0x00ff0000 for no color attribute test.

1 0

Re: [1/3] d3d9/tests: Add LockRect tests with dynamic textures.
by Marvin 04 Feb '17

04 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=28313 Your paranoid android. === w1064 (32 bit visual) === visual.c:7989: Test failed: Got unexpected color 0x00007580 for quad 2 (different colors). visual.c:8093: Test failed: Got unexpected color 0x00000080 for no color attribute test. === w864 (64 bit visual) === visual.c:8093: Test failed: Got unexpected color 0x00ff00ff for no color attribute test.

1 0

Re: [PATCH 2/3] ntdll: Add partial NtQueryInformationThread(ThreadIsIoPending) implementation
by Piotr Caban 03 Feb '17

03 Feb '17

This patch is incorrect, please ignore it. Thanks, Piotr

1 0

Re: [PATCH 2/2] wined3d: Add support for SRCCOLOR2, INVSRCCOLOR2, SRCALPHA2 and INVSRCALPHA2 blend modes.
by Henri Verbeet 03 Feb '17

03 Feb '17

On 2 February 2017 at 19:29, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h > index 4b0ea06..0b801eb 100644 > --- a/include/wine/wined3d.h > +++ b/include/wine/wined3d.h > @@ -400,6 +400,10 @@ enum wined3d_blend > WINED3D_BLEND_BOTHINVSRCALPHA = 13, > WINED3D_BLEND_BLENDFACTOR = 14, > WINED3D_BLEND_INVBLENDFACTOR = 15, > + WINED3D_BLEND_SRCCOLOR2 = 16, > + WINED3D_BLEND_INVSRCCOLOR2 = 17, > + WINED3D_BLEND_SRCALPHA2 = 18, > + WINED3D_BLEND_INVSRCALPHA2 = 19, > }; > What is this naming based on? In d3d11 these are called "D3D11_BLEND_INV_SRC1_ALPHA", etc.

2 1

Re: [PATCH 3/3] mshtml/tests: Added MHTML document tests.
by Marvin 03 Feb '17

03 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=28297 Your paranoid android. === w7u (32 bit htmldoc) === htmldoc.c:2670: Test failed: unexpected call GetOverrideKeyPath

1 0

Re: dmcompos/tests: Fix a failing test on Windows 8.
by Huw Davies 03 Feb '17

03 Feb '17

On Fri, Feb 03, 2017 at 02:24:49PM +0100, Michael Stefaniuc wrote: > On 02/03/2017 12:45 PM, Huw Davies wrote: > > The dirty bit is most likely uninitialized, so sometimes this returns S_OK. > Interesting, that seems to be only newtb-w8 that does that. Yes. FWIW, I tried calling IPersistStream_Save() in order to clear the dirty bit, but that returned E_NOTIMPL on all Windows versions... Huw.

2 1

Re: [PATCH 6/9] d3d9: Fix query result data for not started queries.
by Marvin 03 Feb '17

03 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=28290 Your paranoid android. === w864 (64 bit device) === device.c:3877: Test failed: Failed to reset device, hr 0x88760868, i=1.

1 0

Re: [PATCH 3/3] kernel32: Add GetThreadIOPendingFlag tests
by Dmitry Timoshkov 03 Feb '17

03 Feb '17

Piotr Caban <piotr(a)codeweavers.com> wrote: > + char path[16384] = {0}; ... > + r = GetTempPathA(MAX_PATH, path); > + ok(r, "GetTempPathA error: %u\n", GetLastError()); > + lstrcatA(path, "testIOPendingFlag"); > + r = CreateDirectoryA(path, NULL); > + ok(r, "CreateDirectoryA error: %d\n", GetLastError()); Why path[MAX_PATH] is not enough? Also you need to remove the created directory at the end of the test. -- Dmitry.

2 2

Re: [v2] kernel32: Read entry before LdrInitializeThunk
by Sebastian Lackner 03 Feb '17

03 Feb '17

On 03.02.2017 11:39, Andrew Wesie wrote: > Overwatch overwrites the PE header contents in a TLS callback. This results in > a crash on wine, because the entry point will be incorrect in start_process. > > Fix the issue by reading the entry point before LdrInitializeThunk is called, > and using this stored value in start_process instead of the PE header. > > Signed-off-by: Andrew Wesie <awesie(a)gmail.com> > --- > dlls/kernel32/process.c | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c > index 5a9fea2..48bb7bb 100644 > --- a/dlls/kernel32/process.c > +++ b/dlls/kernel32/process.c > @@ -88,6 +88,7 @@ static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); > > HMODULE kernel32_handle = 0; > SYSTEM_BASIC_INFORMATION system_info = { 0 }; > +LPTHREAD_START_ROUTINE entry_proc = NULL; > > const WCHAR *DIR_Windows = NULL; > const WCHAR *DIR_System = NULL; > @@ -1085,14 +1086,7 @@ static inline DWORD call_process_entry( PEB *peb, LPTHREAD_START_ROUTINE entry ) > */ > static DWORD WINAPI start_process( PEB *peb ) > { > - IMAGE_NT_HEADERS *nt; > - LPTHREAD_START_ROUTINE entry; > - > - nt = RtlImageNtHeader( peb->ImageBaseAddress ); > - entry = (LPTHREAD_START_ROUTINE)((char *)peb->ImageBaseAddress + > - nt->OptionalHeader.AddressOfEntryPoint); > - > - if (!nt->OptionalHeader.AddressOfEntryPoint) > + if (entry_proc == (LPTHREAD_START_ROUTINE)peb->ImageBaseAddress) > { > ERR( "%s doesn't have an entry point, it cannot be executed\n", > debugstr_w(peb->ProcessParameters->ImagePathName.Buffer) ); > @@ -1101,11 +1095,11 @@ static DWORD WINAPI start_process( PEB *peb ) > > if (TRACE_ON(relay)) > DPRINTF( "%04x:Starting process %s (entryproc=%p)\n", GetCurrentThreadId(), > - debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry ); > + debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry_proc ); > > SetLastError( 0 ); /* clear error code */ > if (peb->BeingDebugged) DbgBreakPoint(); > - return call_process_entry( peb, entry ); > + return call_process_entry( peb, entry_proc ); > } > > > @@ -1186,6 +1180,7 @@ void CDECL __wine_kernel_init(void) > RTL_USER_PROCESS_PARAMETERS *params = peb->ProcessParameters; > HANDLE boot_events[2]; > BOOL got_environment = TRUE; > + IMAGE_NT_HEADERS *nt; > > /* Initialize everything */ > > @@ -1299,6 +1294,10 @@ void CDECL __wine_kernel_init(void) > > if (!params->CurrentDirectory.Handle) chdir("/"); /* avoid locking removable devices */ > > + nt = RtlImageNtHeader( peb->ImageBaseAddress ); > + entry_proc = (LPTHREAD_START_ROUTINE)((char *)peb->ImageBaseAddress + > + nt->OptionalHeader.AddressOfEntryPoint); This will not work for .NET CLI-only images. Handling for them is still missing in Wine, but in this case ntdll replaces the entrypoint, which means it shouldn't be stored in a static variable. I would suggest a slightly different solution: pass the start routine as parameter to start_process(). There is no attempt to make this function compatible with Windows, so you can cache the entry point on the ntdll side. This is similar how it is done in this draft patch: https://github.com/wine-compholio/wine-staging/blob/master/patches/ntdll-CL… Nevertheless, it will require careful testing. This example shows that replacing the PE header is valid in some situations, so just ignoring all changes probably also isn't correct. Maybe it should use the value from some loader structure? > + > LdrInitializeThunk( start_process, 0, 0, 0 ); > > error: >

1 0

Re: [1/2] iphlpapi: Add GetUnicastIpAddressEntry implementation (resend)
by Hans Leidekker 03 Feb '17

03 Feb '17

On Fri, 2017-02-03 at 00:08 +0100, André Hentschel wrote: > + GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES | GAA_FLAG_INCLUDE_PREFIX, NULL, NULL, &size); GAA_FLAG_INCLUDE_ALL_INTERFACES has no effect on Wine and you're not using the result of GAA_FLAG_INCLUDE_PREFIX. > + ptr = HeapAlloc(GetProcessHeap(), 0, size); > + ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES | GAA_FLAG_INCLUDE_PREFIX, NULL, ptr, &size); > + if (FAILED(ret)) Please handle allocation failure. GetAdaptersAddresses returns ULONG, not HRESULT.

1 0

Re: [v2 2/3] ntdll: Implement FileIdInformation class support in NtQueryInformationFile.
by Sebastian Lackner 03 Feb '17

03 Feb '17

On 26.01.2017 12:09, Jonathan Doron wrote: > Signed-off-by: Jonathan Doron <jond(a)wizery.com> > --- > configure | 24 ++++++++++++++++++++++++ > configure.ac | 16 ++++++++++++++++ > dlls/ntdll/file.c | 22 +++++++++++++++++++++- > include/config.h.in | 3 +++ > include/winbase.h | 9 +++++++++ > 5 files changed, 73 insertions(+), 1 deletion(-) > > diff --git a/configure b/configure > index 1a96117..a9d7878 100755 > --- a/configure > +++ b/configure > @@ -16407,6 +16407,30 @@ _ACEOF > fi > > > +ac_fn_c_check_member "$LINENO" "struct statfs" "f_fsid.__val" "ac_cv_member_struct_statfs_f_fsid___val" "#include <sys/types.h> > +#ifdef HAVE_SYS_PARAM_H > +# include <sys/param.h> > +#endif > +#ifdef HAVE_SYS_MOUNT_H > +# include <sys/mount.h> > +#endif > +#ifdef HAVE_SYS_VFS_H > +# include <sys/vfs.h> > +#endif > +#ifdef HAVE_SYS_STATFS_H > +# include <sys/statfs.h> > +#endif > +" > +if test "x$ac_cv_member_struct_statfs_f_fsid___val" = xyes; then : > + > +cat >>confdefs.h <<_ACEOF > +#define HAVE_STRUCT_STATFS_F_SID_VAL 1 > +_ACEOF > + > + > +fi > + > + > ac_fn_c_check_member "$LINENO" "struct statvfs" "f_blocks" "ac_cv_member_struct_statvfs_f_blocks" "#ifdef HAVE_SYS_STATVFS_H > #include <sys/statvfs.h> > #endif There is usually no need to include changes for configure. It will automatically be updated when your patch gets accepted. The same also applies to config.h.in. > diff --git a/configure.ac b/configure.ac > index 353f271..3790a39 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -2277,6 +2277,22 @@ AC_CHECK_MEMBERS([struct statfs.f_bfree, struct statfs.f_bavail, struct statfs.f > # include <sys/statfs.h> > #endif]) > > +dnl Check for f_fsid.__val > +AC_CHECK_MEMBERS([struct f_fsid.f_fsid.__val],,, Shouldn't this be "struct statfs.[...]" ? And is there any reason why this isn't merged in the block above, which checks other statfs fields? > +[#include <sys/types.h> > +#ifdef HAVE_SYS_PARAM_H > +# include <sys/param.h> > +#endif > +#ifdef HAVE_SYS_MOUNT_H > +# include <sys/mount.h> > +#endif > +#ifdef HAVE_SYS_VFS_H > +# include <sys/vfs.h> > +#endif > +#ifdef HAVE_SYS_STATFS_H > +# include <sys/statfs.h> > +#endif]) > + > AC_CHECK_MEMBERS([struct statvfs.f_blocks],,, > [#ifdef HAVE_SYS_STATVFS_H > #include <sys/statvfs.h> > diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c > index 6eddd19..38ca0c5 100644 > --- a/dlls/ntdll/file.c > +++ b/dlls/ntdll/file.c > @@ -2379,7 +2379,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, > 0, /* FileRenameInformationBypassAccessCheck */ > 0, /* FileLinkInformationBypassAccessCheck */ > 0, /* FileVolumeNameInformation */ > - 0, /* FileIdInformation */ > + sizeof(FILE_ID_INFORMATION), /* FileIdInformation */ > 0, /* FileIdExtdDirectoryInformation */ > 0, /* FileReplaceCompletionInformation */ > 0, /* FileHardLinkFullIdInformation */ > @@ -2621,6 +2621,26 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, > } > } > break; > + case FileIdInformation: > + { > + struct statfs volstats; > + FILE_ID_INFORMATION *info = ptr; > + if ((fstat(fd, &st) == -1) || (fstatfs(fd, &volstats) == -1)) Other blocks using fstatfs are protected with an #if defined(HAVE_FSTATFS) check. You might need that here, too. > + { > + io->u.Status = FILE_GetNtStatus(); > + } > + else > + { > + memset(info, 0, sizeof(*info)); > +#ifdef HAVE_STRUCT_STATFS_F_SID_VAL With my version of autoconf, the define is called HAVE_STRUCT_F_FSID_F_FSID___VAL (with two additional underscores). Are there differences between the versions of autoconf or have you guessed those names? Please note that you can use "autoreconf -f" to update various files automatically after changing configure.ac. > + memcpy(&info->VolumeSerialNumber, > + &volstats.f_fsid.__val, > + min(sizeof(info->VolumeSerialNumber), sizeof(volstats.f_fsid.__val))); > +#endif > + ((PLARGE_INTEGER)&info->FileId)->QuadPart = st.st_ino; Not really an issue, but it is usually preferred to avoid P* types. You could also write: ((LARGE_INTEGER *)&info->FileId)->QuadPart = st.st_ino; To make your changes even more convincing, I would also recommend to take a look at the existing tests and try to add one for this information class. This could for example be used to verify that FileId is indeed identical to the (smaller) FileId returned by some other info classes. > + } > + } > + break; > default: > FIXME("Unsupported class (%d)\n", class); > io->u.Status = STATUS_NOT_IMPLEMENTED; > diff --git a/include/config.h.in b/include/config.h.in > index 5dcd90b..6bba9df 100644 > --- a/include/config.h.in > +++ b/include/config.h.in > @@ -963,6 +963,9 @@ > /* Define to 1 if `f_namelen' is a member of `struct statfs'. */ > #undef HAVE_STRUCT_STATFS_F_NAMELEN > > +/* Define to 1 if `f_fsid.__val' is a member of `struct statfs'. */ > +#undef HAVE_STRUCT_STATFS_F_SID_VAL > + > /* Define to 1 if `f_blocks' is a member of `struct statvfs'. */ > #undef HAVE_STRUCT_STATVFS_F_BLOCKS > > diff --git a/include/winbase.h b/include/winbase.h > index eff5972..83c27f8 100644 > --- a/include/winbase.h > +++ b/include/winbase.h > @@ -905,6 +905,15 @@ typedef struct _FILE_REMOTE_PROTOCOL_INFO { > } ProtocolSpecificReserved; > } FILE_REMOTE_PROTOCOL_INFO, *PFILE_REMOTE_PROTOCOL_INFO; Those changes should probably go to include/winternl.h. On Windows they are in include/ntifs.h, but we don't have that in Wine yet, and all other FILE_*_INFORMATION structs are also in winternl.h. > > +typedef struct _FILE_ID_128 { > + BYTE Identifier[16]; My header files define this as UCHAR array. If there are multiple versions out there it shouldn't matter what you use, otherwise I would suggest to stick to what is used in official header files. > +} FILE_ID_128, *PFILE_ID_128; > + > +typedef struct _FILE_ID_INFORMATION { > + ULONGLONG VolumeSerialNumber; > + FILE_ID_128 FileId; > +} FILE_ID_INFORMATION, *PFILE_ID_INFORMATION; > + > #define PIPE_ACCESS_INBOUND 1 > #define PIPE_ACCESS_OUTBOUND 2 > #define PIPE_ACCESS_DUPLEX 3 > Feel free to ask if you have any questions. Regards, Sebastian

1 0

Re: [v2 1/3] ntdll: Define more file information classes.
by Sebastian Lackner 03 Feb '17

03 Feb '17

On 26.01.2017 12:09, Jonathan Doron wrote: > Signed-off-by: Jonathan Doron <jond(a)wizery.com> > --- > dlls/ntdll/file.c | 7 +++++++ > include/winternl.h | 7 +++++++ > 2 files changed, 14 insertions(+) > > diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c > index e1583da..6eddd19 100644 > --- a/dlls/ntdll/file.c > +++ b/dlls/ntdll/file.c > @@ -2376,7 +2376,14 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, > 0, /* FileNumaNodeInformation */ > 0, /* FileStandardLinkInformation */ > 0, /* FileRemoteProtocolInformation */ > + 0, /* FileRenameInformationBypassAccessCheck */ > + 0, /* FileLinkInformationBypassAccessCheck */ > + 0, /* FileVolumeNameInformation */ > + 0, /* FileIdInformation */ > + 0, /* FileIdExtdDirectoryInformation */ > 0, /* FileReplaceCompletionInformation */ > + 0, /* FileHardLinkFullIdInformation */ > + 0, /* FileIdExtdBothDirectoryInformation */ > }; > > struct stat st; > diff --git a/include/winternl.h b/include/winternl.h > index f35091c..891b6a7 100644 > --- a/include/winternl.h > +++ b/include/winternl.h > @@ -441,7 +441,14 @@ typedef enum _FILE_INFORMATION_CLASS { > FileNumaNodeInformation, > FileStandardLinkInformation, > FileRemoteProtocolInformation, > + FileRenameInformationBypassAccessCheck, > + FileLinkInformationBypassAccessCheck, > + FileVolumeNameInformation, > + FileIdInformation, > + FileIdExtdDirectoryInformation, > FileReplaceCompletionInformation, > + FileHardLinkFullIdInformation, > + FileIdExtdBothDirectoryInformation, > FileMaximumInformation It looks like the FileMaximumInformation constant is also used in the ntdll/directory tests. Unfortunately, your patch introduces new test failures (not catched automatically because include file changes do not trigger test runs): https://newtestbot.winehq.org/JobDetails.pl?Key=28259. You will have to update those files in the same patch to ensure all tests still pass. Best regards, Sebastian > } FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS; > >

1 0

Re: [1/2] iphlpapi: Add GetUnicastIpAddressEntry implementation (resend)
by Bruno Jesus 03 Feb '17

03 Feb '17

On Thu, Feb 2, 2017 at 9:08 PM, André Hentschel <nerv(a)dawncrow.de> wrote: > For https://bugs.winehq.org/show_bug.cgi?id=41753 > > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > > resending, because of bad timing together with the testbot > > dlls/iphlpapi/iphlpapi.spec | 2 +- > dlls/iphlpapi/iphlpapi_main.c | 77 +++++++++++++++++++++++++++++++++++++++++++ > include/netioapi.h | 17 ++++++++++ > include/ws2def.h | 13 ++++++++ > include/ws2ipdef.h | 7 ++++ > 5 files changed, 115 insertions(+), 1 deletion(-) > > diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec > index 500267c..1a1f8f7 100644 > --- a/dlls/iphlpapi/iphlpapi.spec > +++ b/dlls/iphlpapi/iphlpapi.spec > @@ -147,7 +147,7 @@ > @ stub GetUdpStatsFromStack > @ stdcall GetUdpTable( ptr ptr long ) > @ stub GetUdpTableFromStack > -#@ stub GetUnicastIpAddressEntry > +@ stdcall GetUnicastIpAddressEntry( ptr ) > #@ stub GetUnicastIpAddressTable > @ stdcall GetUniDirectionalAdapterInfo( ptr ptr ) > @ stdcall Icmp6CreateFile() > diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c > index 1daf54d..ff0ad3f 100644 > --- a/dlls/iphlpapi/iphlpapi_main.c > +++ b/dlls/iphlpapi/iphlpapi_main.c > @@ -2467,6 +2467,83 @@ DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, > return ret; > } > > +DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW *row) > +{ > + char buf[MAX_ADAPTER_NAME], *name; > + IP_ADAPTER_ADDRESSES *aa, *ptr; > + ULONG size = 0; > + DWORD ret; > + > + TRACE("%p\n", row); > + > + if (!row) > + return ERROR_INVALID_PARAMETER; > + > + if ((!(name = getInterfaceNameByIndex( row->InterfaceIndex, buf )) && > + !(name = getInterfaceNameByIndex( row->InterfaceLuid.Info.NetLuidIndex, buf )))) > + return ERROR_FILE_NOT_FOUND; > + > + GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES | GAA_FLAG_INCLUDE_PREFIX, NULL, NULL, &size); > + ptr = HeapAlloc(GetProcessHeap(), 0, size); > + ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES | GAA_FLAG_INCLUDE_PREFIX, NULL, ptr, &size); Is it possible to restrict GetAdaptersAddresses family to the one passed in the row? Because in the loop below you check if it matches and skip. If it is possible you could get rid of the row->Address.si_family != uaaddr->si_family test in the loop. > + if (FAILED(ret)) > + { > + HeapFree(GetProcessHeap(), 0, ptr); > + return ret; > + } > + > + ret = ERROR_FILE_NOT_FOUND; > + > + for (aa = ptr; aa; aa = aa->Next) > + { > + IP_ADAPTER_UNICAST_ADDRESS *ua; > + > + if (aa->u.s.IfIndex != row->InterfaceIndex) > + continue; > + > + ret = ERROR_NOT_FOUND; > + > + if (!aa->FirstUnicastAddress) > + continue; Is this really necessary? Since the while will not loop if ua = NULL too. > + ua = aa->FirstUnicastAddress; > + while (ua) > + { > + SOCKADDR_INET *uaaddr = (SOCKADDR_INET *)ua->Address.lpSockaddr; > + if (row->Address.si_family != uaaddr->si_family) > + { > + ua = ua->Next; > + continue; > + } > + > + if ((row->Address.si_family == WS_AF_INET6 && !memcmp(&row->Address.Ipv6.sin6_addr, &uaaddr->Ipv6.sin6_addr, sizeof(row->Address.Ipv6.sin6_addr))) || > + (row->Address.si_family == WS_AF_INET && !memcmp(&row->Address.Ipv4.sin_addr, &uaaddr->Ipv4.sin_addr, sizeof(row->Address.Ipv4.sin_addr)))) > + { > + memcpy(&row->InterfaceLuid, &aa->Luid, sizeof(aa->Luid)); > + row->InterfaceIndex = aa->u.s.IfIndex; > + row->PrefixOrigin = ua->PrefixOrigin; > + row->SuffixOrigin = ua->SuffixOrigin; > + row->ValidLifetime = ua->ValidLifetime; > + row->PreferredLifetime = ua->PreferredLifetime; > + row->OnLinkPrefixLength = ua->OnLinkPrefixLength; > + row->SkipAsSource = 0; > + row->DadState = ua->DadState; > + if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK && row->Address.si_family == WS_AF_INET6) > + row->ScopeId.Value = aa->Ipv6IfIndex; > + else > + row->ScopeId.Value = 0; As I said in the tests and just to say again, that I don't know where this scopeid = ifindex comes from. > + NtQuerySystemTime(&row->CreationTimeStamp); > + HeapFree(GetProcessHeap(), 0, ptr); > + return NO_ERROR; > + } > + ua = ua->Next; > + } > + } > + HeapFree(GetProcessHeap(), 0, ptr); > + > + return ret; > +} > + Best wishes, Bruno

1 0

Re: [2/2] iphlpapi/tests: Add tests for GetUnicastIpAddressEntry (resend)
by Bruno Jesus 03 Feb '17

03 Feb '17

On Thu, Feb 2, 2017 at 9:09 PM, André Hentschel <nerv(a)dawncrow.de> wrote: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > > resending, because of bad timing together with the testbot > > dlls/iphlpapi/tests/iphlpapi.c | 102 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 102 insertions(+) > > diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c > index e4a5864..3814548 100644 > --- a/dlls/iphlpapi/tests/iphlpapi.c > +++ b/dlls/iphlpapi/tests/iphlpapi.c > @@ -75,6 +75,7 @@ static DWORD (WINAPI *pGetTcpTable)(PMIB_TCPTABLE,PDWORD,BOOL); > static DWORD (WINAPI *pGetUdpTable)(PMIB_UDPTABLE,PDWORD,BOOL); > static DWORD (WINAPI *pGetPerAdapterInfo)(ULONG,PIP_PER_ADAPTER_INFO,PULONG); > static DWORD (WINAPI *pGetAdaptersAddresses)(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG); > +static DWORD (WINAPI *pGetUnicastIpAddressEntry)(MIB_UNICASTIPADDRESS_ROW*); > static DWORD (WINAPI *pNotifyAddrChange)(PHANDLE,LPOVERLAPPED); > static BOOL (WINAPI *pCancelIPChangeNotify)(LPOVERLAPPED); > static DWORD (WINAPI *pGetExtendedTcpTable)(PVOID,PDWORD,BOOL,ULONG,TCP_TABLE_CLASS,ULONG); > @@ -123,6 +124,7 @@ static void loadIPHlpApi(void) > pGetUdpTable = (void *)GetProcAddress(hLibrary, "GetUdpTable"); > pGetPerAdapterInfo = (void *)GetProcAddress(hLibrary, "GetPerAdapterInfo"); > pGetAdaptersAddresses = (void *)GetProcAddress(hLibrary, "GetAdaptersAddresses"); > + pGetUnicastIpAddressEntry = (void *)GetProcAddress(hLibrary, "GetUnicastIpAddressEntry"); > pNotifyAddrChange = (void *)GetProcAddress(hLibrary, "NotifyAddrChange"); > pCancelIPChangeNotify = (void *)GetProcAddress(hLibrary, "CancelIPChangeNotify"); > pGetExtendedTcpTable = (void *)GetProcAddress(hLibrary, "GetExtendedTcpTable"); > @@ -1965,6 +1967,105 @@ static void test_GetIfTable2(void) > pFreeMibTable( table ); > } > > +static void test_GetUnicastIpAddressEntry(void) > +{ > + IP_ADAPTER_ADDRESSES *aa, *ptr; > + MIB_UNICASTIPADDRESS_ROW row; > + DWORD ret, size; > + > + if (!pGetUnicastIpAddressEntry) > + { > + win_skip( "GetUnicastIpAddressEntry not available\n" ); > + return; > + } > + if (!pGetAdaptersAddresses) > + { > + win_skip("GetAdaptersAddresses not present\n"); > + return; > + } > + > + ret = pGetUnicastIpAddressEntry( NULL ); > + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); > + > + memset( &row, 0, sizeof(row) ); > + ret = pGetUnicastIpAddressEntry( &row ); > + todo_wine ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); > + > + memset( &row, 0, sizeof(row) ); > + row.Address.Ipv4.sin_family = AF_INET; > + row.Address.Ipv4.sin_port = 0; > + row.Address.Ipv4.sin_addr.S_un.S_addr = 0x01020304; > + ret = pGetUnicastIpAddressEntry( &row ); > + ok( ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret ); > + > + memset( &row, 0, sizeof(row) ); > + row.InterfaceIndex = 123; > + ret = pGetUnicastIpAddressEntry( &row ); > + todo_wine ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); > + > + memset( &row, 0, sizeof(row) ); > + row.InterfaceIndex = get_interface_index(); > + row.Address.Ipv4.sin_family = AF_INET; > + row.Address.Ipv4.sin_port = 0; > + row.Address.Ipv4.sin_addr.S_un.S_addr = 0x01020304; > + ret = pGetUnicastIpAddressEntry( &row ); > + ok( ret == ERROR_NOT_FOUND, "got %u\n", ret ); > + > + memset( &row, 0, sizeof(row) ); > + row.InterfaceIndex = 123; > + row.Address.Ipv4.sin_family = AF_INET; > + row.Address.Ipv4.sin_port = 0; > + row.Address.Ipv4.sin_addr.S_un.S_addr = 0x01020304; > + ret = pGetUnicastIpAddressEntry( &row ); > + ok( ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret ); > + > + ret = pGetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES | GAA_FLAG_INCLUDE_PREFIX, NULL, NULL, &size); > + ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %u\n", ret); > + if (ret != ERROR_BUFFER_OVERFLOW) return; > + > + ptr = HeapAlloc(GetProcessHeap(), 0, size); > + ret = pGetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES | GAA_FLAG_INCLUDE_PREFIX, NULL, ptr, &size); > + ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); > + > + for (aa = ptr; !ret && aa; aa = aa->Next) > + { > + IP_ADAPTER_UNICAST_ADDRESS *ua; > + > + ua = aa->FirstUnicastAddress; > + while (ua) > + { > + memset( &row, 0, sizeof(row) ); > + row.InterfaceIndex = S(U(*aa)).IfIndex; > + memcpy(&row.Address, ua->Address.lpSockaddr, ua->Address.iSockaddrLength); > + > + ret = pGetUnicastIpAddressEntry( &row ); > + ok( ret == NO_ERROR, "got %u\n", ret ); > + ok( row.InterfaceIndex == S(U(*aa)).IfIndex, "got %u\n", row.InterfaceIndex ); > + if (ret == NO_ERROR) > + { > + ok(row.InterfaceLuid.Info.Reserved == aa->Luid.Info.Reserved, "Expected %d, got %d\n", aa->Luid.Info.Reserved, row.InterfaceLuid.Info.Reserved); > + ok(row.InterfaceLuid.Info.NetLuidIndex == aa->Luid.Info.NetLuidIndex, "Expected %d, got %d\n", aa->Luid.Info.NetLuidIndex, row.InterfaceLuid.Info.NetLuidIndex); > + ok(row.InterfaceLuid.Info.IfType == aa->Luid.Info.IfType, "Expected %d, got %d\n", aa->Luid.Info.IfType, row.InterfaceLuid.Info.IfType); > + ok(row.InterfaceIndex == aa->IfIndex, "Expected %d, got %d\n", aa->IfIndex, row.InterfaceIndex); > + ok(row.PrefixOrigin == ua->PrefixOrigin, "Expected %d, got %d\n", ua->PrefixOrigin, row.PrefixOrigin); > + ok(row.SuffixOrigin == ua->SuffixOrigin, "Expected %d, got %d\n", ua->SuffixOrigin, row.SuffixOrigin); > + ok(row.ValidLifetime == ua->ValidLifetime, "Expected %d, got %d\n", ua->ValidLifetime, row.ValidLifetime); > + ok(row.PreferredLifetime == ua->PreferredLifetime, "Expected %d, got %d\n", ua->PreferredLifetime, row.PreferredLifetime); > + ok(row.OnLinkPrefixLength == ua->OnLinkPrefixLength, "Expected %d, got %d\n", ua->OnLinkPrefixLength, row.OnLinkPrefixLength); > + ok(row.SkipAsSource == 0, "Expected 0, got %d\n", row.SkipAsSource); > + ok(row.DadState == ua->DadState, "Expected %d, got %d\n", ua->DadState, row.DadState); Some of these lines are a bit too long, like over 170 characters. Can you break line between message and parameters? > + if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK && row.Address.si_family == AF_INET6) > + ok(row.ScopeId.Value == aa->Ipv6IfIndex || broken(row.ScopeId.Value == 0), "Expected %d, got %d\n", aa->Ipv6IfIndex, row.ScopeId.Value); Is this really true? The index is supposed to be the same as scope ID? The broken makes it suspicious. I can't find any docs to back that. > + else > + ok(row.ScopeId.Value == 0, "Expected 0, got %d\n", row.ScopeId.Value); > + ok(row.CreationTimeStamp.QuadPart, "CreationTimeStamp is 0\n"); > + } > + ua = ua->Next; > + } > + } > + HeapFree(GetProcessHeap(), 0, ptr); > +} > + > START_TEST(iphlpapi) > { > > @@ -1989,6 +2090,7 @@ START_TEST(iphlpapi) > test_interface_identifier_conversion(); > test_GetIfEntry2(); > test_GetIfTable2(); > + test_GetUnicastIpAddressEntry(); > freeIPHlpApi(); > } > } > -- > 2.7.4 > > >

1 0

Re: [2/2] iphlpapi/tests: Add tests for GetUnicastIpAddressEntry
by Marvin 02 Feb '17

02 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=28247 Your paranoid android. === build (build) === Make failed

1 0

Re: [v3 4/6] user32: Add WM_NCPAINT tests for windows crossing screen or maximized
by Marvin 02 Feb '17

02 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=28244 Your paranoid android. === wxppro (32 bit msg) === msg.c:5216: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg sequence is not complete: expected 0000 - actual 0085 === wvistau64 (32 bit msg) === msg.c:5216: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg sequence is not complete: expected 0000 - actual 0085 === w7u (32 bit msg) === msg.c:5216: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg sequence is not complete: expected 0000 - actual 0085 === w7pro64 (32 bit msg) === msg.c:5216: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg sequence is not complete: expected 0000 - actual 0085 === wvistau64 (64 bit msg) === msg.c:5216: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg sequence is not complete: expected 0000 - actual 0085 === w7pro64 (64 bit msg) === msg.c:5216: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg sequence is not complete: expected 0000 - actual 0085

1 0

Re: [v3 3/6] user32: Add tests for windows when first shown if they have children
by Marvin 02 Feb '17

02 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=28243 Your paranoid android. === wxppro (32 bit msg) === msg.c:5141: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg sequence is not complete: expected 0000 - actual 0085 === wvistau64 (32 bit msg) === msg.c:5141: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg sequence is not complete: expected 0000 - actual 0085 === w7u (32 bit msg) === msg.c:5141: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg sequence is not complete: expected 0000 - actual 0085 === w7pro64 (32 bit msg) === msg.c:5141: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg sequence is not complete: expected 0000 - actual 0085 === wvistau64 (64 bit msg) === msg.c:5141: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg sequence is not complete: expected 0000 - actual 0085 === w7pro64 (64 bit msg) === msg.c:5141: Test failed: SetWindowPos:show_popup_first_show_window_child2: 2: the msg sequence is not complete: expected 0000 - actual 0085

1 0

Re: winex11: Remove dead assignment (clang)
by Aric Stewart 02 Feb '17

02 Feb '17

Are you sure that is dead? clang must be saying so but the assignment of ximStyleCallback to ximStyle seems meaningful. Just above this code we have code that ensures that ximStyle is not 0, so if ximStyleCallback == 0 then assigning ximStyleCallback = ximStyle does not seem dead to me. -aric > From: André Hentschel <nerv(a)dawncrow.de> > Subject: winex11: Remove dead assignment (clang) > Message-Id: <8472d171-8b3b-04a7-62cf-a99ee7a37026(a)dawncrow.de> > Date: Mon, 30 Jan 2017 23:11:02 +0100 > > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > dlls/winex11.drv/xim.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c > index e51169d..3978bca 100644 > --- a/dlls/winex11.drv/xim.c > +++ b/dlls/winex11.drv/xim.c > @@ -416,10 +416,7 @@ static BOOL open_xim( Display *display ) > ximStyle = ximStyleNone; > > if (ximStyleCallback == 0) > - { > TRACE("No callback style available\n"); > - ximStyleCallback = ximStyle; > - } > > } > > > -- > 2.7.4

4 5

Re: [PATCH 1/2] user32: Send WM_NCPAINT and WM_ERASEBKGND when window is shown and add tests
by Alexandre Julliard 02 Feb '17

02 Feb '17

Fabian Maurer <dark.shadow4(a)web.de> writes: > Fixes Bug 2624 and 6682 and a few others > > v2: Make patch independent from the WM_NCPAINT issue > > Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> > --- > dlls/user32/tests/msg.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++ > dlls/user32/winpos.c | 7 ++++ > 2 files changed, 111 insertions(+) This would also need tests for child windows, and for various flag combinations. In particular I expect you'd have to handle SWP_DEFERERASE. It would also be more convincing with tests calling SetWindowPos directly instead of through ShowWindow. And whatever changes are necessary should most likely be merged into the existing erase_now() call. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 8/8] wined3d: Implement applying state for compute pipeline.
by Henri Verbeet 02 Feb '17

02 Feb '17

On 2 February 2017 at 12:43, Józef Kucia <jkucia(a)codeweavers.com> wrote: > @@ -3520,19 +3546,19 @@ BOOL context_apply_draw_state(struct wined3d_context *context, > wined3d_buffer_load_sysmem(state->index_buffer, context); > } > > - for (i = 0; i < context->numDirtyEntries; ++i) > + for (i = 0, dirty_idx = 0; i < context->numDirtyEntries; ++i) > { > DWORD rep = context->dirtyArray[i]; > - DWORD idx = rep / (sizeof(*context->isStateDirty) * CHAR_BIT); > - BYTE shift = rep & ((sizeof(*context->isStateDirty) * CHAR_BIT) - 1); > - context->isStateDirty[idx] &= ~(1u << shift); > - state_table[rep].apply(context, state, rep); > + if (!is_compute_state(rep)) > + apply_state(context, state_table, state, rep); > + else > + context->dirtyArray[dirty_idx++] = rep; I'd rather not do this. How important is it to avoid applying compute dispatch states for draws and vice-versa? As an aside, "dirtyArray" is mostly redundant, and possibly a little harmful.

3 3

Re: [PATCH 3/3] ole2.dll16: Implement several IIDs.
by Huw Davies 02 Feb '17

02 Feb '17

On Wed, Feb 01, 2017 at 10:23:55PM -0600, Zebediah Figura wrote: > Needed for https://appdb.winehq.org/objectManager.php?sClass=version&iId=32136 > > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/ole2.dll16/ole2.dll16.spec | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/dlls/ole2.dll16/ole2.dll16.spec b/dlls/ole2.dll16/ole2.dll16.spec > index ed5e917..2789cdc 100644 > --- a/dlls/ole2.dll16/ole2.dll16.spec > +++ b/dlls/ole2.dll16/ole2.dll16.spec > @@ -111,10 +111,10 @@ > 126 stub _IID_IENUMGENERIC > 127 stub _IID_IENUMHOLDER > 128 stub _IID_IENUMCALLBACK > -129 stub _IID_IPERSISTSTREAM > -130 stub _IID_IPERSISTSTORAGE > +129 variable _IID_IPersistStream(0x00000109 0x00000000 0x000000c0 0x46000000) > +130 variable _IID_IPersistStorage(0x0000010a 0x00000000 0x000000c0 0x46000000) > 131 stub _IID_IPERSISTFILE > -132 stub _IID_IPERSIST > +132 variable _IPersist(0x0000010c 0x00000000 0x000000c0 0x46000000) Did you mean to drop the '_IID' prefix here? Huw.

2 1

Stubs in spec files
by Zebediah Figura 02 Feb '17

02 Feb '17

Hi, I am a novice developer with a question about the spec files. Currently the .spec files contain stub lines for functions which have no implementation, and the compiler creates assembly thunks to __wine_spec_unimplemented_stub, which raises an exception when the function is called. However, some entries in the spec files are actually not functions but data, and when applications attempt to read this data they instead read the instruction code of the thunks. I recently was debugging a 16-bit application [1] which was referring to a GUID that I could not find defined anywhere, and only after some time was able to figure out that the application was reading the thunk code for _IID_IClassFactory in this way. The NE segment loading code in krnl386.dll16 will print a warning if an application attempts to request the location of a symbol not defined in the library. However, since the stubs are defined, no such message is printed, but the program will effectively be given a pointer to junk memory. As far as I can tell there is no way to add such a message either. What would in fact work is not to implement stub code in the libraries at all. In 16-bit code this results in a warning when the value is accessed, followed by a crash if it is a function which the code attempts to call. In 32-bit code this seems to behave identically to a stub function. Thus the only difference is that in 16-bit code (and possibly 32-bit code, but I could not find any variable that I could test with) a warning is printed (and 0xdeadbeef is returned instead of junk memory), which I see as a definite improvement. By commenting out all of the stub lines in compobj.dll16.spec I was able to locate several more that the program requested, but I may still be missing some in other DLLs. My question, then, is—is there any purpose of the stub lines besides to directly call __wine_spec_unimplemented_stub, or any other reason why this proposal would be detrimental? Thanks, Zebediah Figura

3 4

Re: [PATCH 3/3] mshtml/tests: Added COM aggregation tests.
by Marvin 02 Feb '17

02 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=28226 Your paranoid android. === w7u (32 bit htmldoc) === htmldoc.c:2643: Test failed: unexpected call GetOverrideKeyPath htmldoc.c:5053: Test failed: unexpected call {d9befc84-f21e-4166-874b-a8d3010dc764}

1 0

Re: [PATCH 2/2] comdlg32: Delay OleInitialize() for Windows versions older than Vista.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Józef Kucia <jkucia(a)codeweavers.com> writes: > This fixes a regression introduced by commit > f65e04770dc5748521a0de73814cea0b085bf3f8. > > OleInitialize() creates a window for the main apartment. SimCity 2000 > expects that the first created window after GetOpenFileA() is a file > dialog window. According to tests, this is expected to work on Windows > versions before Windows Vista. > > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Is a version check really necessary? Couldn't we find some better way? In what way does the app depend on the window creation order? -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 6/8] wined3d: Introduce wined3d_device_dispatch_compute().
by Henri Verbeet 02 Feb '17

02 Feb '17

On 2 February 2017 at 12:43, Józef Kucia <jkucia(a)codeweavers.com> wrote: > diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c > index a3d88b9..4980413 100644 > --- a/dlls/wined3d/drawprim.c > +++ b/dlls/wined3d/drawprim.c > @@ -580,3 +580,46 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s > > TRACE("Done all gl drawing.\n"); > } > + > +void dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, > + unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) I don't care too much, but in the longer term I'd be inclined to merge drawprim.c into some other file like context.c.

1 0

Re: [PATCH 3/5] wined3d: Fix querying texture-related limits on core profile.
by Józef Kucia 02 Feb '17

02 Feb '17

On Thu, Feb 2, 2017 at 1:04 AM, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > else > { > gl_info->limits.texture_coords = max(gl_info->limits.texture_coords, gl_max); > + TRACE("Max texture coords: %d.\n", gl_info->limits.texture_coords); > gl_info->limits.fragment_samplers = max(gl_info->limits.fragment_samplers, gl_max); > } Is this "else" block supposed to be executed only for legacy contexts? It might be better to merge it into the "if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT])" block above.

1 0

Re: user32: Hardcode the GetWindowLong values for the desktop window to avoid a server round-trip.
by Marvin 02 Feb '17

02 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=28217 Your paranoid android. === w7u (32 bit win) === win.c:1003: Test failed: wrong dwWindowStatus: 0000 != 0001 active 00CD01B0 fg 000401AE in hook HCBT_MINMAX

2 1

Re: [PATCH v2] user32: In menu.c converted all tabs to spaces
by Michael Stefaniuc 02 Feb '17

02 Feb '17

Hello Fabian, On 02/01/2017 11:25 PM, Fabian Maurer wrote: > This change makes it a lot to edit easier with some editors. > Conversion done with Notepad++, with tabsize 8 spaces. > > v2: removed trailing whitespace > > Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> > --- > dlls/user32/menu.c | 1922 ++++++++++++++++++++++++++-------------------------- > 1 file changed, 961 insertions(+), 961 deletions(-) sorry, but this is just change noise. You can do the TAB to SPACE changes en passant when modifying the respective lines. Probably the only valid exception is when the indentation of the code is visibly messed up. But that's not the case here. bye michael

2 3

Re: user32: Avoid querying the server to determine whether the desktop window is a child window.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Huw Davies <huw(a)codeweavers.com> writes: > Signed-off-by: Huw Davies <huw(a)codeweavers.com> > --- > dlls/user32/win.c | 31 +++++++++++++++++++++++++++++-- > 1 file changed, 29 insertions(+), 2 deletions(-) > > diff --git a/dlls/user32/win.c b/dlls/user32/win.c > index a7be4a3..341769f 100644 > --- a/dlls/user32/win.c > +++ b/dlls/user32/win.c > @@ -414,6 +414,33 @@ static HWND *list_window_parents( HWND hwnd ) > return NULL; > } > > +/******************************************************************* > + * is_child_win > + * > + * Helper to determine whether WS_CHILD is set. > + * It avoids a server round trip for the desktop window. > + */ We could probably make GetWindowLong return hardcoded values for the desktop window, so that all callers benefit. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH] winealsa.drv: Fix handling of system real time MIDI messages
by Andrew Eikum 02 Feb '17

02 Feb '17

On Tue, Jan 31, 2017 at 04:16:17AM -0200, Bruno Jesus wrote: > MIDI spec at http://www.somascape.org/midi/tech/spec.html state that system real time messages "... are each single byte messages, with no following data bytes...", currently wine is prepending SYSEX header generating invalid messages. > Looking at this spec, should Tune Request be handled the same way as these system real time messages? I also noticed Reset is still handled as a SysEx after your patch. Should it be? Aside from that, I also noticed an old patch that unfortunately never got merged: https://www.winehq.org/pipermail/wine-patches/2013-January/121366.html If you understand this MIDI stuff a little bit, you might be a good person to review and re-submit that patch :) Thanks, Andrew

2 2

Re: [PATCH] wmvcore.c: Implement WMCreateReaderPriv
by Bruno Jesus 02 Feb '17

02 Feb '17

On Wed, Feb 1, 2017 at 11:35 PM, Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> wrote: > > -HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) > +HRESULT WINAPI WMCreateReaderPriv(IWMReader **ret_reader) > { > WMReader *reader; > > - TRACE("(%p, %x, %p)\n", reserved, rights, ret_reader); > - > reader = heap_alloc(sizeof(*reader)); > if(!reader) > return E_OUTOFMEMORY; > @@ -667,6 +665,13 @@ HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_ > return S_OK; > } IMO it's better to not change the original function, make the newer function call WMCreateReader passing NULL reserved and 0 for rights. > +HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) > +{ > + TRACE("(%p, %x, %p)\n", reserved, rights, ret_reader); > + > + return WMCreateReaderPriv(ret_reader); > +} > + You are mixing spaces and tabs, please use the most common style from the file.

1 0

Re: [2/2] advapi32/tests: Add test of LsaLookupSids buffer behaviour
by Marvin 02 Feb '17

02 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=28202 Your paranoid android. === wvistau64 (64 bit lsa) === Found no trace of the test summary line or of a crash === w2008s64 (64 bit lsa) === Found no trace of the test summary line or of a crash === w7pro64 (64 bit lsa) === Found no trace of the test summary line or of a crash === w864 (64 bit lsa) === Found no trace of the test summary line or of a crash === w1064 (64 bit lsa) === Found no trace of the test summary line or of a crash

1 0

Re: [PATCH v2] kernel32: Add stub implementation of NtQueryInformationThread(ThreadIsIoPending)
by Alexandre Julliard 01 Feb '17

01 Feb '17

Piotr Caban <piotr(a)codeweavers.com> writes: > v2: > - set last error on failure in GetThreadIOPendingFlag > > Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> > --- > dlls/kernel32/thread.c | 13 +++++++++++-- > dlls/ntdll/thread.c | 7 ++++++- > 2 files changed, 17 insertions(+), 3 deletions(-) This breaks the tests: ../../../tools/runtest -q -P wine -T ../../.. -M kernel32.dll -p kernel32_test.exe.so thread && touch thread.ok thread.c:1977: Test failed: for info 16 expected STATUS_ACCESS_DENIED, got 00000000 (ret_len 4) thread.c:345: Tests skipped: child process wasn't mapped at same address, so can't do CreateRemoteThread tests. Makefile:731: recipe for target 'thread.ok' failed make: *** [thread.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/2] user32: Add WM_NCPAINT tests for windows crossing screen or maximized
by Marvin 01 Feb '17

01 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=28193 Your paranoid android. === w864 (64 bit msg) === msg.c:10732: Test failed: wrong qstatus 00690048 msg.c:10783: Test failed: wrong qstatus 00290000 msg.c:10788: Test failed: PeekMessageA should have returned FALSE instead of msg 031f

1 0

Re: [PATCH 5/5] ddraw: Update the primary surface format when changing the display mode.
by Stefan Dösinger 01 Feb '17

01 Feb '17

Am 2017-02-01 um 11:02 schrieb Henri Verbeet: > hr = set_display_mode(ddraw, 640, 480); > ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); > > + memset(&surface_desc, 0, sizeof(surface_desc)); > + surface_desc.dwSize = sizeof(surface_desc); > + hr = IDirectDrawSurface_GetSurfaceDesc(primary, &surface_desc); > + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); > + ok(surface_desc.dwWidth == 640, "Got unexpected surface width %u.\n", surface_desc.dwWidth); > + ok(surface_desc.dwHeight == 480, "Got unexpected surface height %u.\n", surface_desc.dwHeight); > + ok(U1(surface_desc.ddpfPixelFormat).dwRGBBitCount == 32 > + || U1(surface_desc.ddpfPixelFormat).dwRGBBitCount == 24, > + "Got unexpected bit count %u.\n", U1(surface_desc.ddpfPixelFormat).dwRGBBitCount); Since we know ddraw does magic on WM_DISPLAYCHANGE messages: Does this also happen when you change the mode behind ddraw's back with ChangeDisplaySettings?

2 1

Re: xmllite: Add Unknown to map (Coverity)
by Nikolay Sivov 01 Feb '17

01 Feb '17

On 31.01.2017 1:11, André Hentschel wrote: > CID 1364307 > > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > dlls/xmllite/reader.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c > index 1e3c7aa..f99ea66 100644 > --- a/dlls/xmllite/reader.c > +++ b/dlls/xmllite/reader.c > @@ -85,6 +85,7 @@ typedef enum > > static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; > static const WCHAR utf8W[] = {'U','T','F','-','8',0}; > +static const WCHAR unknownW[] = {'U','n','k','n','o','w','n',0}; > > static const WCHAR dblquoteW[] = {'\"',0}; > static const WCHAR quoteW[] = {'\'',0}; > @@ -151,8 +152,9 @@ struct xml_encoding_data > }; > > static const struct xml_encoding_data xml_encoding_map[] = { > - { utf16W, XmlEncoding_UTF16, ~0 }, > - { utf8W, XmlEncoding_UTF8, CP_UTF8 } > + { utf16W, XmlEncoding_UTF16, ~0 }, > + { utf8W, XmlEncoding_UTF8, CP_UTF8 }, > + { unknownW, XmlEncoding_Unknown, ~0 }, > }; > > const WCHAR *get_encoding_name(xml_encoding encoding) > I don't think this fixes anything in a sense of making xmllite more compliant. We probably should just fail at CreateXmlWriterOutputWithEncodingName() and print encoding string that made it fail.

2 1

Re: [PATCH v3] user32: Don't send WM_CHAR when a menu gets VK_ESCAPE and add tests
by Alexandre Julliard 01 Feb '17

01 Feb '17

Fabian Maurer <dark.shadow4(a)web.de> writes: > diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c > index 59fcd9c488..a4d59713c9 100644 > --- a/dlls/user32/menu.c > +++ b/dlls/user32/menu.c > @@ -3077,7 +3077,9 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, > break; > } > > - TranslateMessage( &msg ); > + /* Don't translate escape-keydown message because it leads to an unexpected WM_CHAR */ > + if( !(msg.message == WM_KEYDOWN && msg.wParam == VK_ESCAPE) ) > + TranslateMessage( &msg ); > mt.pt = msg.pt; You could do it like that, but I think it would be cleaner to move this into the part that checks keyboard messages, and call TranslateMessage for messages that have not been handled otherwise. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: gameux/tests: Run the MTA tests before the STA tests to avoid a crash on Windows 10.
by Marvin 01 Feb '17

01 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=28186 Your paranoid android. === w8 (32 bit gameexplorer) === Found no trace of the test summary line or of a crash

2 1

Re: [PATCH 2/7] regedit: Use FormatMessage() for optimal memory usage (v2)
by Alexandre Julliard 01 Feb '17

01 Feb '17

Hugh McMaster <hugh.mcmaster(a)outlook.com> writes: > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > programs/regedit/edit.c | 14 +++++++++----- > programs/regedit/regedit.rc | 12 ++++++------ > 2 files changed, 15 insertions(+), 11 deletions(-) > > diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c > index a223535..3f2b7a4 100644 > --- a/programs/regedit/edit.c > +++ b/programs/regedit/edit.c > @@ -49,15 +49,19 @@ struct edit_params > static INT vmessagebox(HWND hwnd, INT buttons, INT titleId, INT resId, va_list ap) > { > WCHAR title[256]; > - WCHAR errfmt[1024]; > - WCHAR errstr[1024]; > + WCHAR fmt[1024]; > + WCHAR *str; > + int ret; > > LoadStringW(hInst, titleId, title, COUNT_OF(title)); > - LoadStringW(hInst, resId, errfmt, COUNT_OF(errfmt)); > + LoadStringW(hInst, resId, fmt, COUNT_OF(fmt)); > > - vsnprintfW(errstr, COUNT_OF(errstr), errfmt, ap); > + FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, > + fmt, 0, 0, (WCHAR *)&str, 0, &ap); > + ret = MessageBoxW(hwnd, str, title, buttons); > + LocalFree(str); > > - return MessageBoxW(hwnd, errstr, title, buttons); > + return ret; > } You have to use __ms_va_list with FormatMessage. Check how this is done in regedit.c. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 2/2] ucrtbase/tests: Add tests for __conio_common_vcprintf()/_vcwprintf()
by Piotr Caban 01 Feb '17

01 Feb '17

Hi, this tests will not work when there's no console window. It will break the tests under wine when running them this way: wine ucrtbase_test.exe.so printf &>log I think it's OK if we test only print functions that work on strings/file descriptors so we don't spam test output. Thanks, Piotr

1 0

Re: [PATCH 2/2] winspool+localspl: Move AddPrinterW implementation to localspl
by Huw Davies 01 Feb '17

01 Feb '17

On Thu, Jan 26, 2017 at 06:24:38PM +0100, Detlef Riekenberg wrote: > We need to move AddPrinter to allow importing CUPS printers > centralized in the spooler service. (bug 3507, bug 10358) > > localspl will be used from the application (through winspool.drv) > and from the spooler service (through spoolss.dll) > > The changes before and after the code move are as minimal as possible Hi Detlef, Could you explain a bit more about where this going? How much more will need to move to localspl to enable this to happen? Is it possible for the spooler service to use winspool.drv instead of spoolss.dll? I've also inlined a few comments below. > diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c > index f359b73..9b12c63 100644 > --- a/dlls/localspl/provider.c > +++ b/dlls/localspl/provider.c > @@ -93,13 +93,22 @@ static monitor_t * pm_localport; > -static const WCHAR spoolW[] = {'\\','s','p','o','o','l',0}; > -static const WCHAR driversW[] = {'\\','d','r','i','v','e','r','s','\\',0}; > +static const WCHAR printer_driverW[] = {'P','r','i','n','t','e','r',' ','D','r','i','v','e','r',0}; > +static const WCHAR priorityW[] = {'P','r','i','o','r','i','t','y',0}; > +static const WCHAR providerW[] = {'P','r','o','v','i','d','e','r',0}; providerW is unused. > +static HKEY localspl_OpenDriverReg(LPCWSTR pEnvironment) > +{ > + HKEY retval = NULL; > + LPWSTR buffer; > + const printenv_t * env; > + > + TRACE("(%s)\n", debugstr_w(pEnvironment)); > + > + env = validate_envW(pEnvironment); > + if (!env) return NULL; > + > + buffer = heap_alloc((strlenW(fmt_driversW) + strlenW(env->envname) + strlenW(env->versionregpath) + 1) * sizeof(WCHAR)); > + > + if(buffer) { I know this is copied from winspool.drv, but let's try to be consistent with the formatting and put that brace on a new line. Same for other K&R style hunks below. > +static WINAPI DEVMODEW * get_default_devmode(LPWSTR printername, LPWSTR drivername) > +{ > + > + LONG size; > + HMODULE hwinspool; > + DEVMODEW * dm = NULL; > + LONG (WINAPI * pDocumentPropertiesW)(HWND hWnd, HANDLE hPrinter, LPWSTR pDeviceName, > + LPDEVMODEW pDevModeOutput, LPDEVMODEW pDevModeInput, DWORD fMode); > + > + TRACE("printername: %s, drivername: %s\n", debugstr_w(printername), debugstr_w(drivername)); > + > + hwinspool = LoadLibraryW(winspooldrvW); > + if (!hwinspool) return NULL; > + > + pDocumentPropertiesW = (void *) GetProcAddress(hwinspool, "DocumentPropertiesW"); Calling back to winspool.drv seems awkward. You could simply have winspool.drv set pi->pDevMode before calling localspl. Of course, that leaves the question of what spoolss should do, but that depends on what your answers are to the first questions. Huw.

1 0

Re: [PATCH] comctl32/tests: Use HGLOBAL stream to Read/Write tests on imagelists
by Dmitry Timoshkov 01 Feb '17

01 Feb '17

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > dlls/comctl32/tests/imagelist.c | 120 ++++++++++++++++++---------------------- > 1 file changed, 53 insertions(+), 67 deletions(-) ... > -struct my_IStream > +struct memstream > { > IStream IStream_iface; > - char *iml_data; /* written imagelist data */ > - ULONG iml_data_size; > + IStream *stream; > }; > > -static struct my_IStream *impl_from_IStream(IStream *iface) > +static struct memstream *impl_from_IStream(IStream *iface) > { > - return CONTAINING_RECORD(iface, struct my_IStream, IStream_iface); > + return CONTAINING_RECORD(iface, struct memstream, IStream_iface); > } You could at least try to avoid unecessary structure renaming. > static HRESULT STDMETHODCALLTYPE Test_Stream_QueryInterface(IStream *iface, REFIID riid, > @@ -709,34 +708,15 @@ static ULONG STDMETHODCALLTYPE Test_Stream_Release(IStream *iface) > static HRESULT STDMETHODCALLTYPE Test_Stream_Read(IStream *iface, void *pv, ULONG cb, > ULONG *pcbRead) > { > - ok(0, "unexpected call\n"); > - return E_NOTIMPL; > -} This is not an improvement. The patch neither simplifies the code nor makes it more readable. Besides the test is no longer able to detect that Read method should not be called. What is the idea behind this? -- Dmitry.

1 0

[v3 PATCH 00/10] x86: Enable User-Mode Instruction Prevention
by Ricardo Neri 01 Feb '17

01 Feb '17

This is v3 of this series. Again, it took me a while to complete the updates as support for virtual-8086 mode required extra rework. The two previous submissions can be found here [1] and here [2]. User-Mode Instruction Prevention (UMIP) is a security feature present in new Intel Processors. If enabled, it prevents the execution of certain instructions if the Current Privilege Level (CPL) is greater than 0. If these instructions were executed while in CPL > 0, user space applications could have access to system-wide settings such as the global and local descriptor tables, the segment selectors to the current task state and the local descriptor table. These are the instructions covered by UMIP: * SGDT - Store Global Descriptor Table * SIDT - Store Interrupt Descriptor Table * SLDT - Store Local Descriptor Table * SMSW - Store Machine Status Word * STR - Store Task Register If any of these instructions is executed with CPL > 0, a general protection exception is issued when UMIP is enabled. There is a caveat, however. Certain applications rely on some of these instructions to function. An example of this are applications that use WineHQ[3]. For instance, these applications rely on sidt returning a non- accesible memory location[4]. During the discussions, it was proposed that the fault could be relied to the user-space and perform the emulation in user-mode. However, this would break existing applications until, for instance, they update to a new WineHQ version. However, this approach would require UMIP to be disabled by default. The concensus in this forum is to always enable it. This patchset initially treated tasks running in virtual-8086 mode as a special case. However, I received clarification that DOSEMU[5] does not support applications that use these instructions. It relies on WineHQ for this[6]. Furthermore, the applications for which the concern was raised run in protected mode [4]. This version keeps UMIP enabled at all times and by default. If a general protection fault caused by the instructions protected by UMIP is detected, such fault will be fixed-up by returning dummy values as follows: * SGDT and SIDT return hard-coded dummy values as the base of the global descriptor and interrupt descriptor tables. These hard-coded values are located within a memory map hole in x86_64. For x86_32, the same values are used but truncated to 4 bytes. This is also the case for virtual- 8086 mode tasks, in which the base is truncated to 3 bytes. In all cases, the limit of the table is set to 0. * STR and SLDT return 0 as the segment selector. This looks appropriate since we are providing a dummy value as the base address of the global descriptor table. * SMSW returns the value with which the CR0 register is programmed in head_32/64.S at boot time. This is, the following bits are enabed: CR0.0 for Protection Enable, CR.1 for Monitor Coprocessor, CR.4 for Extension Type, which will always be 1 in recent processors with UMIP; CR.5 for Numeric Error, CR0.16 for Write Protect, CR0.18 for Alignment Mask. Additionally, in x86_64, CR0.31 for Paging is set. The proposed emulation code is handles faults that happens in both protected and virtual-8086 mode. I found very useful the code for Intel MPX (Memory Protection Extensions) used to parse opcodes and the memory locations contained in the general purpose registers when used as operands. I put some of this code in a separate library file that both MPX and UMIP can access and avoid code duplication. While here, I fixed two small bugs that I found in the MPX implementation. This new library was also extended to handle 16-bit address encodings as those found in virtual-8086 mode tasks. A set of representative selftests for virtual-8086 mode tasks are included as part of this series. The tested uses use displacements, registers to indicate memory addresses as well as the use as registers as operands. Extensive test cases were performed to test the page fault that is emulated when memory to write the instructions results is not accesible[7], to tests almost all combinations of operands (ModRM, SiB, REX prefix and displacements) in protected mode[8] and to test almost all the combinations of operands in virtual-8086 mode[9]. If there is interest, this could could also be submitted for the kernel selftests. [1]. https://lwn.net/Articles/705877/ [2]. https://lkml.org/lkml/2016/12/23/265 [3]. https://www.winehq.org/ [4]. https://www.winehq.org/pipermail/wine-devel/2016-November/115320.html [5]. http://www.dosemu.org/ [6]. http://marc.info/?l=linux-kernel&m=147876798717927&w=2 [7]. https://github.com/01org/luv-yocto/blob/rneri/umip/meta-luv/recipes-core/um… [8]. https://github.com/01org/luv-yocto/blob/rneri/umip/meta-luv/recipes-core/um… [9]. https://github.com/01org/luv-yocto/blob/rneri/umip/meta-luv/recipes-kernel/… Thanks and BR, Ricardo Changes since V2: * Added new utility functions to decode the memory addresses contained in registers when the 16-bit addressing encodings are used. This includes code to obtain and compute memory addresses using segment selectors for real-mode address translation. * Added support to emulate UMIP-protected instructions for virtual-8086 tasks. * Added selftests for virtual-8086 mode that contains representative use cases: address represented as a displacement, address in registers and registers as operands. * Instead of maintaining a static variable for the dummy base addresses of the IDT and GDT, a hard-coded value is used. * The emulated SMSW instructions now return the value with which the CR0 register is programmed in head_32/64.S This is: PE | MP | ET | NE | WP | AM. For x86_64, PG is also enabled. * The new file arch/x86/lib/insn-utils.c is now renamed as arch/x86/lib/ insn-kernel.c. It also has its own header. This helps keep in sync the the kernel and objtool instruction decoders. Also, the new insn-kernel.c contains utility functions that are only relevant in a kernel context. * Removed printed warnings for errors that occur when decoding instructions with invalid operands. * Added more comments on fixes in the instruction-decoding MPX functions. * Now user_64bit_mode(regs) is used instead of test_thread_flag(TIF_IA32) to determine if the task is 32-bit or 64-bit. * Found and fixed a bug in insn-decoder in which X86_MODRM_RM was incorrectly used to obtain the mod part of the ModRM byte. * Added more explanatory code in emulation and instruction decoding code. This includes a comment regarding that copy_from_user could fail if there exists a memory protection key in place. * Tested code with CONFIG_X86_DECODER_SELFTEST=y and everything passes now. * Prefixed get_reg_offset_rm with insn_ as this function is exposed via a header file. For clarity, this function was added in a separate patch. Changes since V1: * Virtual-8086 mode tasks are not treated in a special manner. All code for this purpose was removed. * Instead of attempting to disable UMIP during a context switch or when entering virtual-8086 mode, UMIP remains enabled all the time. General protection faults that occur are fixed-up by returning dummy values as detailed above. * Removed umip= kernel parameter in favor of using clearcpuid=514 to disable UMIP. * Removed selftests designed to detect the absence of SIGSEGV signals when running in virtual-8086 mode. * Reused code from MPX to decode instructions operands. For this purpose code was put in a common location. * Fixed two bugs in MPX code that decodes operands. Cc: Andy Lutomirski <luto(a)kernel.org> Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: Borislav Petkov <bp(a)suse.de> Cc: Brian Gerst <brgerst(a)gmail.com> Cc: Chen Yucong <slaoub(a)gmail.com> Cc: Chris Metcalf <cmetcalf(a)mellanox.com> Cc: Dave Hansen <dave.hansen(a)linux.intel.com> Cc: Fenghua Yu <fenghua.yu(a)intel.com> Cc: Huang Rui <ray.huang(a)amd.com> Cc: Jiri Slaby <jslaby(a)suse.cz> Cc: Jonathan Corbet <corbet(a)lwn.net> Cc: Michael S. Tsirkin <mst(a)redhat.com> Cc: Paul Gortmaker <paul.gortmaker(a)windriver.com> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Ravi V. Shankar <ravi.v.shankar(a)intel.com> Cc: Vlastimil Babka <vbabka(a)suse.cz> Cc: Shuah Khan <shuah(a)kernel.org> Cc: Paolo Bonzini <pbonzini(a)redhat.com> Cc: Liang Z Li <liang.z.li(a)intel.com> Cc: x86(a)kernel.org Cc: linux-msdos(a)vger.kernel.org Ricardo Neri (10): x86/mpx: Do not use SIB index if index points to R/ESP x86/mpx: Fail decoding when SIB baseR/EBP is and no displacement is used x86/mpx, x86/insn: Relocate insn util functions to a new insn-kernel x86/insn-kernel: Add a function to obtain register offset in ModRM x86/insn-kernel: Add support to resolve 16-bit addressing encodings x86/cpufeature: Add User-Mode Instruction Prevention definitions x86: Add emulation code for UMIP instructions x86/traps: Fixup general protection faults caused by UMIP x86: Enable User-Mode Instruction Prevention selftests/x86: Add tests for User-Mode Instruction Prevention arch/x86/Kconfig | 10 + arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/disabled-features.h | 8 +- arch/x86/include/asm/insn-kernel.h | 17 ++ arch/x86/include/asm/umip.h | 15 ++ arch/x86/include/uapi/asm/processor-flags.h | 2 + arch/x86/kernel/Makefile | 1 + arch/x86/kernel/cpu/common.c | 16 +- arch/x86/kernel/traps.c | 4 + arch/x86/kernel/umip.c | 251 +++++++++++++++++++ arch/x86/lib/Makefile | 2 +- arch/x86/lib/insn-kernel.c | 344 ++++++++++++++++++++++++++ arch/x86/mm/mpx.c | 120 +-------- tools/testing/selftests/x86/entry_from_vm86.c | 39 ++- 14 files changed, 708 insertions(+), 122 deletions(-) create mode 100644 arch/x86/include/asm/insn-kernel.h create mode 100644 arch/x86/include/asm/umip.h create mode 100644 arch/x86/kernel/umip.c create mode 100644 arch/x86/lib/insn-kernel.c -- 2.9.3

4 24

Re: [PATCH] fix command line argument escaping in build_command_line
by Fabian Maurer 01 Feb '17

01 Feb '17

On Tuesday, January 31, 2017 3:42:45 PM CET Jacob Lifshay wrote: > [PATCH] fix command line argument escaping in build_command_line Please change the commit message to include "kernel32: " at the beginning.

1 0

Re: wbemprox: Add a partial implementation of Win32_IP4RouteTable.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Hans Leidekker <hans(a)codeweavers.com> writes: > Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> > --- > dlls/wbemprox/builtin.c | 75 +++++++++++++++++++++++++++++++++++++++++++++ > dlls/wbemprox/tests/query.c | 63 +++++++++++++++++++++++++++++++++++++ > 2 files changed, 138 insertions(+) This doesn't build on Mingw: i686-w64-mingw32-gcc -c -o builtin.o ../../../wine/dlls/wbemprox/builtin.c -I. -I../../../wine/dlls/wbemprox \ -I../../include -I../../../wine/include -D__WINESRC__ -DUSE_WS_PREFIX -D_REENTRANT -Wall -pipe \ -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers \ -Wshift-overflow=2 -Wstrict-prototypes -Wtype-limits -Wunused-but-set-parameter -Wvla \ -Wwrite-strings -Wpointer-arith -Wlogical-op -gdwarf-2 -gstrict-dwarf -fno-omit-frame-pointer \ -g -O2 -fno-diagnostics-show-caret -D_WIN32 In file included from ../../../wine/dlls/wbemprox/builtin.c:38:0: ../../../wine/include/ws2tcpip.h:176:104: warning: ‘struct timeval’ declared inside parameter list will not be visible outside of this definition or declaration ../../../wine/include/ws2tcpip.h:178:107: warning: ‘struct timeval’ declared inside parameter list will not be visible outside of this definition or declaration ../../../wine/dlls/wbemprox/builtin.c: In function ‘fill_ip4routetable’: ../../../wine/dlls/wbemprox/builtin.c:2074:47: warning: implicit declaration of function ‘ntohl’ [-Wimplicit-function-declaration] ../.././../obj-elf64/tools/winegcc/winegcc -o wbemprox.dll -B../.././../obj-elf64/tools/winebuild \ --sysroot=../.. -b i686-w64-mingw32 -fasynchronous-unwind-tables -shared ../../../wine/dlls/wbemprox/wbemprox.spec \ builtin.o class.o main.o process.o qualifier.o query.o reg.o security.o service.o services.o \ table.o wbemlocator.o wql.tab.o wbemprox_r.res ../../dlls/winspool.drv/libwinspool.a \ ../../dlls/version/libversion.a ../../dlls/iphlpapi/libiphlpapi.a ../../dlls/dxgi/libdxgi.a \ ../../dlls/oleaut32/liboleaut32.a ../../dlls/ole32/libole32.a ../../dlls/advapi32/libadvapi32.a \ ../../dlls/user32/libuser32.a ../../dlls/gdi32/libgdi32.a ../../dlls/ws2_32/libws2_32.a \ ../../dlls/rpcrt4/librpcrt4.a ../../libs/port/libwine_port.a -lwine builtin.o: In function `fill_ip4routetable': /home/julliard/wine/build/obj-pe32/dlls/wbemprox/../../../wine/dlls/wbemprox/builtin.c:2074: undefined reference to `ntohl' /home/julliard/wine/build/obj-pe32/dlls/wbemprox/../../../wine/dlls/wbemprox/builtin.c:2076: undefined reference to `ntohl' collect2: error: ld returned 1 exit status winegcc: i686-w64-mingw32-gcc failed Makefile:638: recipe for target 'wbemprox.dll' failed -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] user32:add SIZEALL_BIG cursor, reusing SIZEALL resource Fixes bug#42303
by Alexandre Julliard 31 Jan '17

31 Jan '17

Anton Romanov <theli.ua(a)gmail.com> writes: > @@ -2227,6 +2227,7 @@ typedef struct tagCBTACTIVATESTRUCT > #define IDC_HAND MAKEINTRESOURCE(32649) > #define IDC_APPSTARTING MAKEINTRESOURCE(32650) > #define IDC_HELP MAKEINTRESOURCE(32651) > +#define IDC_SIZEALL_BIG MAKEINTRESOURCE(32654) There's no such definition in Windows. > @@ -1011,6 +1011,7 @@ > #define OCR_NO 32648 > #define OCR_HAND 32649 > #define OCR_APPSTARTING 32650 > +#define OCR_SIZEALL_BIG 32654 This is already defined as OCR_RDR2DIM. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH] wined3d: Implement buffer texture range.
by Guillaume Charifi 31 Jan '17

31 Jan '17

Thank you for your detailed answer :) Le 31/01/2017 à 00:19, Józef Kucia a écrit : > I'll explain in more details to encourage you ;-) > > On Sun, Jan 29, 2017 at 1:12 PM, Józef Kucia <joseph.kucia(a)gmail.com> wrote: >> Please add a test. > Adding a test should be very easy. In test_buffer_srv() everything is > ready to add a test with an offset. You can use "rgba16_buffer" as > data, set size to {2.0f, 2.0f} or {1.0f, 1.0f}, and test with > different values of "srv_first_element" and "srv_element_count". Try > to come up with interesting test cases and test edge cases. Looks easier than I thought, indeed. I'll be doing this. > >> On Sun, Jan 29, 2017 at 12:25 AM, Guillaume Charifi >> <guillaume.charifi(a)sfr.fr> wrote: >>> + GL_EXTCALL(glTexBufferRange(GL_TEXTURE_BUFFER, view_format->glInternal, buffer->buffer_object, >>> + desc->u.buffer.start_idx, desc->u.buffer.count)); >> This is wrong. > glTexBufferRange() accepts offsets and sizes in bytes, but in D3D11 > offsets and sizes for typed buffers are expressed as the number of > elements. You have to multiply "start_idx" and "count" by > "view_format->byte_count". A test would also help you to find this > mistake. Oh, I see, I'm fixing it. > > Another advice: start small. It's better to send a few well tested > patches and get them accepted first. > > I'll hope to see some patches from you committed soon. > > Cheers, > Józef >

1 0

Re: [PATCH 2/2] winspool/tests: Test for LastError also on success of AddMonitor
by Huw Davies 31 Jan '17

31 Jan '17

On Mon, Jan 30, 2017 at 07:43:35PM +0100, Detlef Riekenberg wrote: > dlls/winspool.drv/tests/info.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c > index f6527c5..602e935 100644 > --- a/dlls/winspool.drv/tests/info.c > +++ b/dlls/winspool.drv/tests/info.c > @@ -435,6 +435,12 @@ static void test_AddMonitor(void) > SetLastError(MAGIC_DEAD); > res = AddMonitorA(NULL, 2, (LPBYTE) &mi2a); > ok(res, "returned %d with %d (expected '!= 0')\n", res, GetLastError()); > + if (res) > + { > + /* Some apps depend on the result of GetLastError() */ > + res = GetLastError(); > + ok(res == ERROR_SUCCESS, "got 0x%x/%u (expected ERROR_SUCCESS)\n", res, res); > + } There's no need to have this test conditional on res. Also, don't reassign res to the error, just use GetLastError() directly. And just print the error in decimal. Huw.

1 0

Re: [PATCH 1/2] localspl: Clear LastError on success in AddMonitor
by Huw Davies 31 Jan '17

31 Jan '17

On Mon, Jan 30, 2017 at 07:43:34PM +0100, Detlef Riekenberg wrote: > dlls/localspl/provider.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c > index f359b73..f370b9f 100644 > --- a/dlls/localspl/provider.c > +++ b/dlls/localspl/provider.c > @@ -1541,6 +1541,9 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) > RegCloseKey(hentry); > } > > + if (res) > + SetLastError(ERROR_SUCCESS); /* Monitor installer depend on this */ > + > RegCloseKey(hroot); > return (res); > } I think unconditionally resetting the error after monitor_unload() would be cleaner. Huw.

1 0

Re: comctl32: Fix some more spec file entries
by Huw Davies 31 Jan '17

31 Jan '17

On Sun, Jan 29, 2017 at 09:58:36PM +0100, André Hentschel wrote: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > dlls/comctl32/comctl32.spec | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec > index c3e9167..dbfa123 100644 > --- a/dlls/comctl32/comctl32.spec > +++ b/dlls/comctl32/comctl32.spec > @@ -93,7 +93,7 @@ > 382 stdcall -noname SmoothScrollWindow(ptr) > 383 stub -noname DoReaderMode > 384 stdcall -noname SetPathWordBreakProc(ptr long) > -385 stdcall -ordinal DPA_EnumCallback(long long ptr) > +385 stdcall -ordinal DPA_EnumCallback(long ptr ptr) Should be: 385 stdcall -ordinal DPA_EnumCallback(ptr ptr ptr) Huw.

4 3

Re: [PATCH] winealsa.drv: Fix handling of system real time MIDI messages
by Austin English 31 Jan '17

31 Jan '17

On Tue, Jan 31, 2017 at 12:16 AM, Bruno Jesus <00cpxxx(a)gmail.com> wrote: > MIDI spec at http://www.somascape.org/midi/tech/spec.html state that system real time messages "... are each single byte messages, with no following data bytes...", currently wine is prepending SYSEX header generating invalid messages. > > A comparison before and after patch using gmidimonitor as ouput MIDI port: > http://alexa.pro.br/~bruno/wine/midi.png > > I believe the patch to be correct, I don't own any MIDI hardware to test but gmidimonitor seems good enough. Do wineoss / winepulse need similar fixes? -- -Austin GPG: 14FB D7EA A041 937B

2 1

Re: [PATCH] regedit: When processing 3.1 ignore any lines that don't begin with HKCR.
by Nikolay Sivov 31 Jan '17

31 Jan '17

On 31.01.2017 5:51, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > programs/regedit/regproc.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c > index c055c10..b6de728 100644 > --- a/programs/regedit/regproc.c > +++ b/programs/regedit/regproc.c > @@ -616,8 +616,9 @@ static void processRegEntry31(WCHAR *line) > int res; > > static WCHAR empty[] = {0}; > + static WCHAR hkcr[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}; > > - if (line[0] == '\0') return; > + if (memcmp(line, hkcr, sizeof(hkcr) - sizeof(WCHAR))) return; > > /* get key name */ > while (line[key_end] && !isspaceW(line[key_end])) key_end++; > Is it guaranteed 'line' is a least that large? Also you can remove terminating 0 from hkcr to avoid sizeof(WCHAR) subtraction.

2 1

Re: [PATCH 05/10] wined3d: Add compute shaders cb/samplers state updates.
by Guillaume Charifi 30 Jan '17

30 Jan '17

Thank you for your feedback. WineD3D/D3D11/OpenGL are complex APIs with lots of tricky details. I know my implementation is far from perfect, but it seems that you learn better by working, trying, so I do. I have a basic but (likely) working tessellation implementation and I'll submit it soon. But it's quite dirty, so I expect feedbacks to improve it (if you haven't done it locally yet). Btw, I think you should write down somewhere who is currently working on what at Crossover, to avoid useless duplicated work. <div>-------- Message d'origine --------</div><div>De : Józef Kucia <joseph.kucia(a)gmail.com> </div><div>Date :30/01/2017 14:13 (GMT+01:00) </div><div>À : wine-devel <wine-devel(a)winehq.org> </div><div>Cc : Guillaume Charifi <guillaume.charifi(a)sfr.fr> </div><div>Objet : Re: [PATCH 05/10] wined3d: Add compute shaders cb/samplers state updates. </div><div> </div>FWIW, I have a patch series adding basic support for compute shaders in my patch queue. I should start submitting the series when my SM5 shader instructions series from wine-patches is committed. I've skimmed over your patches though. I'll share some high-level comments. On Sun, Jan 29, 2017 at 2:43 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> > --- > dlls/wined3d/context.c | 1 + > dlls/wined3d/state.c | 3 +++ > 2 files changed, 4 insertions(+) > > diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c > index ca73bcc..eaae0b8 100644 > --- a/dlls/wined3d/context.c > +++ b/dlls/wined3d/context.c > @@ -3382,6 +3382,7 @@ static void context_bind_shader_resources(struct wined3d_context *context, const > { > {WINED3D_SHADER_TYPE_PIXEL, 0, MAX_FRAGMENT_SAMPLERS}, > {WINED3D_SHADER_TYPE_VERTEX, MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS}, > + {WINED3D_SHADER_TYPE_COMPUTE, 0, MAX_COMPUTE_SAMPLERS}, > }; I don't think that adding a proper support for binding compute shader resources is that simple.

2 1

Re: comctl32: Correctly set the colour table for ILC_COLOR4 and ILC_COLOR8 imagelists.
by Marvin 30 Jan '17

30 Jan '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=28138 Your paranoid android. === wxppro (32 bit imagelist) === imagelist.c:2057: Test failed: 4: remove all, add 8: got color[0] 00 00 00 expect ff 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[1] 80 00 00 expect 00 ff 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[2] 00 80 00 expect 00 00 ff imagelist.c:2057: Test failed: 4: remove all, add 8: got color[3] 80 80 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[4] 00 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[5] 80 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[6] 00 80 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[7] c0 c0 c0 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[8] 80 80 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[9] ff 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[10] 00 ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[11] ff ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[12] 00 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[13] ff 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[14] 00 ff ff expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[15] ff ff ff expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[0] 00 00 00 expect ff 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[1] 80 00 00 expect 00 ff 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[2] 00 80 00 expect 00 00 ff imagelist.c:2057: Test failed: 4: remove all, add 4: got color[3] 80 80 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[4] 00 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[5] 80 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[6] 00 80 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[7] c0 c0 c0 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[8] 80 80 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[9] ff 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[10] 00 ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[11] ff ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[12] 00 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[13] ff 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[14] 00 ff ff expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[15] ff ff ff expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[0] 00 00 00 expect ff 00 ff imagelist.c:2057: Test failed: 4: add 4: got color[1] 80 00 00 expect ff ff 00 imagelist.c:2057: Test failed: 4: add 4: got color[2] 00 80 00 expect 00 ff ff imagelist.c:2057: Test failed: 4: add 4: got color[3] 80 80 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[4] 00 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[5] 80 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[6] 00 80 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[7] c0 c0 c0 expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[8] 80 80 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[9] ff 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[10] 00 ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[11] ff ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[12] 00 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[13] ff 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[14] 00 ff ff expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[15] ff ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[0] 00 00 00 expect ff 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[1] 80 00 00 expect 00 ff 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[2] 00 80 00 expect 00 00 ff imagelist.c:2057: Test failed: 8: remove all, add 8: got color[3] 80 80 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[4] 00 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[5] 80 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[6] 00 80 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[7] c0 c0 c0 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[8] c0 dc c0 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[9] a6 ca f0 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[10] 00 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[11] 33 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[12] 33 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[13] 00 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[14] 16 16 16 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[15] 1c 1c 1c expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[16] 22 22 22 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[17] 29 29 29 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[18] 55 55 55 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[19] 4d 4d 4d expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[20] 42 42 42 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[21] 39 39 39 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[22] ff 7c 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[23] ff 50 50 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[24] d6 00 93 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[25] cc ec ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[26] ef d6 c6 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[27] e7 e7 d6 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[28] ad a9 90 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[29] 33 ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[30] 66 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[31] 99 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[32] cc 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[33] 00 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[34] 33 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[35] 66 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[36] 99 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[37] cc 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[38] ff 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[39] 00 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[40] 33 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[41] 66 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[42] 99 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[43] cc 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[44] ff 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[45] 00 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[46] 33 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[47] 66 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[48] 99 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[49] cc 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[50] ff 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[51] 00 cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[52] 33 cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[53] 66 cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[54] 99 cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[55] cc cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[56] ff cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[57] 66 ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[58] 99 ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[59] cc ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[60] 00 ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[61] 33 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[62] 66 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[63] 99 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[64] cc 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[65] ff 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[66] 00 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[67] 33 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[68] 66 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[69] 99 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[70] cc 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[71] ff 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[72] 00 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[73] 33 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[74] 66 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[75] 99 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[76] cc 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[77] ff 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[78] 00 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[79] 33 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[80] 66 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[81] 99 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[82] cc 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[83] ff 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[84] 00 cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[85] 33 cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[86] 66 cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[87] 99 cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[88] cc cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[89] ff cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[90] 33 ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[91] 66 ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[92] 99 ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[93] cc ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[94] ff ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[95] 00 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[96] 33 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[97] 66 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[98] 99 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[99] cc 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[100] ff 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[101] 00 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[102] 33 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[103] 66 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[104] 99 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[105] cc 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[106] ff 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[107] 00 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[108] 33 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[109] 66 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[110] 99 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[111] cc 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[112] 00 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[113] 33 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[114] 66 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[115] 99 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[116] cc 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[117] ff 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[118] 00 cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[119] 33 cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[120] 99 cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[121] cc cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[122] ff cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[123] 00 ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[124] 33 ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[125] 99 ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[126] cc ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[127] ff 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[128] cc 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[129] 00 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[130] 99 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[131] 99 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[132] cc 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[133] 00 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[134] 33 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[135] 66 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[136] cc 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[137] ff 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[138] 00 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[139] 33 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[140] 66 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[141] 99 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[142] cc 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[143] ff 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[144] 33 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[145] 66 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[146] 99 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[147] cc 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[148] ff 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[149] 00 cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[150] 33 cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[151] 66 cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[152] 99 cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[153] cc cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[154] ff cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[155] 00 ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[156] 33 ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[157] 66 cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[158] 99 ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[159] cc ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[160] ff ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[161] 00 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[162] 33 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[163] 66 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[164] 99 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[165] cc 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[166] 00 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[167] 33 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[168] 66 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[169] 99 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[170] cc 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[171] ff 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[172] 00 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[173] 33 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[174] 66 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[175] 99 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[176] cc 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[177] ff 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[178] 00 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[179] 33 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[180] 66 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[181] 99 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[182] cc 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[183] ff 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[184] 00 cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[185] 33 cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[186] 66 cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[187] 99 cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[188] cc cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[189] ff cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[190] 00 ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[191] 33 ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[192] 66 ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[193] 99 ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[194] cc ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[195] ff ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[196] 33 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[197] 66 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[198] 99 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[199] 00 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[200] 33 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[201] 66 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[202] 99 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[203] cc 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[204] ff 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[205] 00 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[206] 33 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[207] 66 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[208] 99 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[209] cc 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[210] ff 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[211] 00 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[212] 33 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[213] 66 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[214] 99 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[215] cc 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[216] ff 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[217] 00 cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[218] 33 cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[219] 66 cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[220] 99 cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[221] cc cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[222] ff cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[223] 33 ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[224] 66 ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[225] 99 ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[226] cc ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[227] ff 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[228] 66 ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[229] ff ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[230] 66 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[231] ff 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[232] 66 ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[233] a5 00 21 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[234] 5f 5f 5f expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[235] 77 77 77 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[236] 86 86 86 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[237] 96 96 96 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[238] cb cb cb expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[239] b2 b2 b2 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[240] d7 d7 d7 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[241] dd dd dd expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[242] e3 e3 e3 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[243] ea ea ea expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[244] f1 f1 f1 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[245] f8 f8 f8 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[246] ff fb f0 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[247] a0 a0 a4 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[248] 80 80 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[249] ff 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[250] 00 ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[251] ff ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[252] 00 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[253] ff 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[254] 00 ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[255] ff ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[0] 00 00 00 expect ff 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[1] 80 00 00 expect 00 ff 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[2] 00 80 00 expect 00 00 ff imagelist.c:2057: Test failed: 8: remove all, add 4: got color[3] 80 80 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[4] 00 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[5] 80 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[6] 00 80 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[7] c0 c0 c0 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[8] c0 dc c0 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[9] a6 ca f0 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[10] 00 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[11] 33 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[12] 33 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[13] 00 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[14] 16 16 16 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[15] 1c 1c 1c expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[16] 22 22 22 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[17] 29 29 29 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[18] 55 55 55 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[19] 4d 4d 4d expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[20] 42 42 42 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[21] 39 39 39 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[22] ff 7c 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[23] ff 50 50 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[24] d6 00 93 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[25] cc ec ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[26] ef d6 c6 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[27] e7 e7 d6 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[28] ad a9 90 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[29] 33 ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[30] 66 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[31] 99 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[32] cc 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[33] 00 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[34] 33 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[35] 66 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[36] 99 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[37] cc 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[38] ff 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[39] 00 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[40] 33 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[41] 66 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[42] 99 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[43] cc 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[44] ff 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[45] 00 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[46] 33 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[47] 66 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[48] 99 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[49] cc 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[50] ff 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[51] 00 cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[52] 33 cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[53] 66 cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[54] 99 cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[55] cc cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[56] ff cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[57] 66 ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[58] 99 ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[59] cc ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[60] 00 ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[61] 33 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[62] 66 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[63] 99 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[64] cc 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[65] ff 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[66] 00 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[67] 33 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[68] 66 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[69] 99 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[70] cc 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[71] ff 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[72] 00 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[73] 33 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[74] 66 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[75] 99 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[76] cc 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[77] ff 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[78] 00 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[79] 33 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[80] 66 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[81] 99 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[82] cc 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[83] ff 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[84] 00 cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[85] 33 cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[86] 66 cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[87] 99 cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[88] cc cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[89] ff cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[90] 33 ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[91] 66 ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[92] 99 ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[93] cc ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[94] ff ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[95] 00 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[96] 33 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[97] 66 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[98] 99 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[99] cc 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[100] ff 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[101] 00 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[102] 33 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[103] 66 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[104] 99 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[105] cc 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[106] ff 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[107] 00 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[108] 33 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[109] 66 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[110] 99 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[111] cc 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[112] 00 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[113] 33 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[114] 66 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[115] 99 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[116] cc 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[117] ff 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[118] 00 cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[119] 33 cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[120] 99 cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[121] cc cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[122] ff cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[123] 00 ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[124] 33 ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[125] 99 ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[126] cc ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[127] ff 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[128] cc 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[129] 00 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[130] 99 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[131] 99 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[132] cc 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[133] 00 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[134] 33 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[135] 66 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[136] cc 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[137] ff 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[138] 00 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[139] 33 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[140] 66 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[141] 99 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[142] cc 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[143] ff 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[144] 33 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[145] 66 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[146] 99 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[147] cc 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[148] ff 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[149] 00 cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[150] 33 cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[151] 66 cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[152] 99 cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[153] cc cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[154] ff cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[155] 00 ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[156] 33 ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[157] 66 cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[158] 99 ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[159] cc ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[160] ff ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[161] 00 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[162] 33 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[163] 66 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[164] 99 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[165] cc 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[166] 00 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[167] 33 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[168] 66 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[169] 99 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[170] cc 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[171] ff 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[172] 00 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[173] 33 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[174] 66 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[175] 99 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[176] cc 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[177] ff 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[178] 00 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[179] 33 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[180] 66 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[181] 99 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[182] cc 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[183] ff 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[184] 00 cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[185] 33 cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[186] 66 cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[187] 99 cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[188] cc cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[189] ff cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[190] 00 ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[191] 33 ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[192] 66 ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[193] 99 ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[194] cc ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[195] ff ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[196] 33 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[197] 66 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[198] 99 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[199] 00 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[200] 33 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[201] 66 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[202] 99 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[203] cc 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[204] ff 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[205] 00 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[206] 33 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[207] 66 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[208] 99 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[209] cc 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[210] ff 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[211] 00 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[212] 33 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[213] 66 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[214] 99 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[215] cc 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[216] ff 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[217] 00 cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[218] 33 cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[219] 66 cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[220] 99 cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[221] cc cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[222] ff cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[223] 33 ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[224] 66 ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[225] 99 ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[226] cc ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[227] ff 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[228] 66 ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[229] ff ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[230] 66 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[231] ff 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[232] 66 ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[233] a5 00 21 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[234] 5f 5f 5f expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[235] 77 77 77 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[236] 86 86 86 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[237] 96 96 96 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[238] cb cb cb expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[239] b2 b2 b2 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[240] d7 d7 d7 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[241] dd dd dd expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[242] e3 e3 e3 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[243] ea ea ea expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[244] f1 f1 f1 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[245] f8 f8 f8 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[246] ff fb f0 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[247] a0 a0 a4 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[248] 80 80 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[249] ff 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[250] 00 ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[251] ff ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[252] 00 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[253] ff 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[254] 00 ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[255] ff ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[0] 00 00 00 expect ff 00 ff imagelist.c:2057: Test failed: 8: add 4: got color[1] 80 00 00 expect ff ff 00 imagelist.c:2057: Test failed: 8: add 4: got color[2] 00 80 00 expect 00 ff ff imagelist.c:2057: Test failed: 8: add 4: got color[3] 80 80 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[4] 00 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[5] 80 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[6] 00 80 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[7] c0 c0 c0 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[8] c0 dc c0 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[9] a6 ca f0 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[10] 00 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[11] 33 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[12] 33 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[13] 00 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[14] 16 16 16 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[15] 1c 1c 1c expect 00 00 00 === w2003std (32 bit imagelist) === imagelist.c:2057: Test failed: 4: remove all, add 8: got color[0] 00 00 00 expect ff 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[1] 80 00 00 expect 00 ff 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[2] 00 80 00 expect 00 00 ff imagelist.c:2057: Test failed: 4: remove all, add 8: got color[3] 80 80 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[4] 00 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[5] 80 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[6] 00 80 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[7] c0 c0 c0 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[8] 80 80 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[9] ff 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[10] 00 ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[11] ff ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[12] 00 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[13] ff 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[14] 00 ff ff expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 8: got color[15] ff ff ff expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[0] 00 00 00 expect ff 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[1] 80 00 00 expect 00 ff 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[2] 00 80 00 expect 00 00 ff imagelist.c:2057: Test failed: 4: remove all, add 4: got color[3] 80 80 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[4] 00 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[5] 80 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[6] 00 80 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[7] c0 c0 c0 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[8] 80 80 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[9] ff 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[10] 00 ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[11] ff ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[12] 00 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[13] ff 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[14] 00 ff ff expect 00 00 00 imagelist.c:2057: Test failed: 4: remove all, add 4: got color[15] ff ff ff expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[0] 00 00 00 expect ff 00 ff imagelist.c:2057: Test failed: 4: add 4: got color[1] 80 00 00 expect ff ff 00 imagelist.c:2057: Test failed: 4: add 4: got color[2] 00 80 00 expect 00 ff ff imagelist.c:2057: Test failed: 4: add 4: got color[3] 80 80 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[4] 00 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[5] 80 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[6] 00 80 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[7] c0 c0 c0 expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[8] 80 80 80 expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[9] ff 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[10] 00 ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[11] ff ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[12] 00 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[13] ff 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[14] 00 ff ff expect 00 00 00 imagelist.c:2057: Test failed: 4: add 4: got color[15] ff ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[0] 00 00 00 expect ff 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[1] 80 00 00 expect 00 ff 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[2] 00 80 00 expect 00 00 ff imagelist.c:2057: Test failed: 8: remove all, add 8: got color[3] 80 80 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[4] 00 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[5] 80 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[6] 00 80 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[7] c0 c0 c0 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[8] c0 dc c0 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[9] a6 ca f0 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[10] 00 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[11] 33 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[12] 33 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[13] 00 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[14] 16 16 16 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[15] 1c 1c 1c expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[16] 22 22 22 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[17] 29 29 29 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[18] 55 55 55 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[19] 4d 4d 4d expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[20] 42 42 42 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[21] 39 39 39 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[22] ff 7c 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[23] ff 50 50 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[24] d6 00 93 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[25] cc ec ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[26] ef d6 c6 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[27] e7 e7 d6 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[28] ad a9 90 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[29] 33 ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[30] 66 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[31] 99 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[32] cc 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[33] 00 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[34] 33 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[35] 66 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[36] 99 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[37] cc 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[38] ff 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[39] 00 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[40] 33 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[41] 66 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[42] 99 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[43] cc 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[44] ff 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[45] 00 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[46] 33 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[47] 66 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[48] 99 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[49] cc 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[50] ff 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[51] 00 cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[52] 33 cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[53] 66 cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[54] 99 cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[55] cc cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[56] ff cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[57] 66 ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[58] 99 ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[59] cc ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[60] 00 ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[61] 33 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[62] 66 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[63] 99 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[64] cc 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[65] ff 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[66] 00 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[67] 33 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[68] 66 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[69] 99 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[70] cc 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[71] ff 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[72] 00 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[73] 33 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[74] 66 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[75] 99 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[76] cc 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[77] ff 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[78] 00 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[79] 33 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[80] 66 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[81] 99 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[82] cc 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[83] ff 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[84] 00 cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[85] 33 cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[86] 66 cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[87] 99 cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[88] cc cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[89] ff cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[90] 33 ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[91] 66 ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[92] 99 ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[93] cc ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[94] ff ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[95] 00 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[96] 33 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[97] 66 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[98] 99 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[99] cc 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[100] ff 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[101] 00 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[102] 33 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[103] 66 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[104] 99 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[105] cc 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[106] ff 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[107] 00 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[108] 33 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[109] 66 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[110] 99 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[111] cc 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[112] 00 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[113] 33 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[114] 66 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[115] 99 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[116] cc 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[117] ff 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[118] 00 cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[119] 33 cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[120] 99 cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[121] cc cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[122] ff cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[123] 00 ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[124] 33 ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[125] 99 ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[126] cc ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[127] ff 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[128] cc 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[129] 00 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[130] 99 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[131] 99 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[132] cc 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[133] 00 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[134] 33 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[135] 66 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[136] cc 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[137] ff 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[138] 00 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[139] 33 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[140] 66 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[141] 99 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[142] cc 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[143] ff 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[144] 33 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[145] 66 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[146] 99 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[147] cc 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[148] ff 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[149] 00 cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[150] 33 cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[151] 66 cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[152] 99 cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[153] cc cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[154] ff cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[155] 00 ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[156] 33 ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[157] 66 cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[158] 99 ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[159] cc ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[160] ff ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[161] 00 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[162] 33 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[163] 66 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[164] 99 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[165] cc 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[166] 00 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[167] 33 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[168] 66 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[169] 99 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[170] cc 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[171] ff 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[172] 00 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[173] 33 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[174] 66 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[175] 99 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[176] cc 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[177] ff 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[178] 00 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[179] 33 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[180] 66 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[181] 99 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[182] cc 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[183] ff 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[184] 00 cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[185] 33 cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[186] 66 cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[187] 99 cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[188] cc cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[189] ff cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[190] 00 ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[191] 33 ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[192] 66 ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[193] 99 ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[194] cc ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[195] ff ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[196] 33 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[197] 66 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[198] 99 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[199] 00 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[200] 33 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[201] 66 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[202] 99 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[203] cc 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[204] ff 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[205] 00 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[206] 33 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[207] 66 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[208] 99 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[209] cc 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[210] ff 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[211] 00 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[212] 33 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[213] 66 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[214] 99 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[215] cc 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[216] ff 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[217] 00 cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[218] 33 cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[219] 66 cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[220] 99 cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[221] cc cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[222] ff cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[223] 33 ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[224] 66 ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[225] 99 ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[226] cc ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[227] ff 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[228] 66 ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[229] ff ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[230] 66 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[231] ff 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[232] 66 ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[233] a5 00 21 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[234] 5f 5f 5f expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[235] 77 77 77 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[236] 86 86 86 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[237] 96 96 96 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[238] cb cb cb expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[239] b2 b2 b2 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[240] d7 d7 d7 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[241] dd dd dd expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[242] e3 e3 e3 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[243] ea ea ea expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[244] f1 f1 f1 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[245] f8 f8 f8 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[246] ff fb f0 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[247] a0 a0 a4 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[248] 80 80 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[249] ff 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[250] 00 ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[251] ff ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[252] 00 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[253] ff 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[254] 00 ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 8: got color[255] ff ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[0] 00 00 00 expect ff 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[1] 80 00 00 expect 00 ff 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[2] 00 80 00 expect 00 00 ff imagelist.c:2057: Test failed: 8: remove all, add 4: got color[3] 80 80 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[4] 00 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[5] 80 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[6] 00 80 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[7] c0 c0 c0 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[8] c0 dc c0 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[9] a6 ca f0 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[10] 00 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[11] 33 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[12] 33 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[13] 00 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[14] 16 16 16 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[15] 1c 1c 1c expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[16] 22 22 22 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[17] 29 29 29 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[18] 55 55 55 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[19] 4d 4d 4d expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[20] 42 42 42 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[21] 39 39 39 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[22] ff 7c 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[23] ff 50 50 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[24] d6 00 93 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[25] cc ec ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[26] ef d6 c6 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[27] e7 e7 d6 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[28] ad a9 90 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[29] 33 ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[30] 66 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[31] 99 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[32] cc 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[33] 00 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[34] 33 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[35] 66 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[36] 99 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[37] cc 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[38] ff 33 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[39] 00 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[40] 33 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[41] 66 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[42] 99 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[43] cc 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[44] ff 66 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[45] 00 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[46] 33 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[47] 66 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[48] 99 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[49] cc 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[50] ff 99 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[51] 00 cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[52] 33 cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[53] 66 cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[54] 99 cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[55] cc cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[56] ff cc 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[57] 66 ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[58] 99 ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[59] cc ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[60] 00 ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[61] 33 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[62] 66 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[63] 99 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[64] cc 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[65] ff 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[66] 00 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[67] 33 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[68] 66 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[69] 99 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[70] cc 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[71] ff 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[72] 00 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[73] 33 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[74] 66 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[75] 99 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[76] cc 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[77] ff 66 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[78] 00 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[79] 33 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[80] 66 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[81] 99 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[82] cc 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[83] ff 99 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[84] 00 cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[85] 33 cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[86] 66 cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[87] 99 cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[88] cc cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[89] ff cc 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[90] 33 ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[91] 66 ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[92] 99 ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[93] cc ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[94] ff ff 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[95] 00 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[96] 33 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[97] 66 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[98] 99 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[99] cc 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[100] ff 00 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[101] 00 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[102] 33 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[103] 66 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[104] 99 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[105] cc 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[106] ff 33 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[107] 00 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[108] 33 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[109] 66 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[110] 99 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[111] cc 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[112] 00 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[113] 33 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[114] 66 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[115] 99 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[116] cc 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[117] ff 99 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[118] 00 cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[119] 33 cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[120] 99 cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[121] cc cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[122] ff cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[123] 00 ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[124] 33 ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[125] 99 ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[126] cc ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[127] ff 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[128] cc 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[129] 00 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[130] 99 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[131] 99 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[132] cc 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[133] 00 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[134] 33 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[135] 66 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[136] cc 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[137] ff 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[138] 00 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[139] 33 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[140] 66 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[141] 99 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[142] cc 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[143] ff 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[144] 33 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[145] 66 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[146] 99 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[147] cc 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[148] ff 99 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[149] 00 cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[150] 33 cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[151] 66 cc 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[152] 99 cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[153] cc cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[154] ff cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[155] 00 ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[156] 33 ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[157] 66 cc 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[158] 99 ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[159] cc ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[160] ff ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[161] 00 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[162] 33 00 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[163] 66 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[164] 99 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[165] cc 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[166] 00 33 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[167] 33 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[168] 66 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[169] 99 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[170] cc 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[171] ff 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[172] 00 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[173] 33 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[174] 66 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[175] 99 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[176] cc 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[177] ff 66 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[178] 00 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[179] 33 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[180] 66 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[181] 99 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[182] cc 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[183] ff 99 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[184] 00 cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[185] 33 cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[186] 66 cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[187] 99 cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[188] cc cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[189] ff cc cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[190] 00 ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[191] 33 ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[192] 66 ff 99 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[193] 99 ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[194] cc ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[195] ff ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[196] 33 00 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[197] 66 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[198] 99 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[199] 00 33 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[200] 33 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[201] 66 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[202] 99 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[203] cc 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[204] ff 33 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[205] 00 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[206] 33 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[207] 66 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[208] 99 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[209] cc 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[210] ff 66 cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[211] 00 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[212] 33 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[213] 66 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[214] 99 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[215] cc 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[216] ff 99 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[217] 00 cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[218] 33 cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[219] 66 cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[220] 99 cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[221] cc cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[222] ff cc ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[223] 33 ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[224] 66 ff cc expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[225] 99 ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[226] cc ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[227] ff 66 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[228] 66 ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[229] ff ff 66 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[230] 66 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[231] ff 66 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[232] 66 ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[233] a5 00 21 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[234] 5f 5f 5f expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[235] 77 77 77 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[236] 86 86 86 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[237] 96 96 96 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[238] cb cb cb expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[239] b2 b2 b2 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[240] d7 d7 d7 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[241] dd dd dd expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[242] e3 e3 e3 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[243] ea ea ea expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[244] f1 f1 f1 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[245] f8 f8 f8 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[246] ff fb f0 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[247] a0 a0 a4 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[248] 80 80 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[249] ff 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[250] 00 ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[251] ff ff 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[252] 00 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[253] ff 00 ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[254] 00 ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: remove all, add 4: got color[255] ff ff ff expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[0] 00 00 00 expect ff 00 ff imagelist.c:2057: Test failed: 8: add 4: got color[1] 80 00 00 expect ff ff 00 imagelist.c:2057: Test failed: 8: add 4: got color[2] 00 80 00 expect 00 ff ff imagelist.c:2057: Test failed: 8: add 4: got color[3] 80 80 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[4] 00 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[5] 80 00 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[6] 00 80 80 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[7] c0 c0 c0 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[8] c0 dc c0 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[9] a6 ca f0 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[10] 00 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[11] 33 00 00 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[12] 33 00 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[13] 00 33 33 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[14] 16 16 16 expect 00 00 00 imagelist.c:2057: Test failed: 8: add 4: got color[15] 1c 1c 1c expect 00 00 00

2 1

Re: [PATCH 05/10] wined3d: Add compute shaders cb/samplers state updates.
by Guillaume Charifi 30 Jan '17

30 Jan '17

I meant Codeweavers.

1 0

Re: [PATCH v2] user32: Also remove WM_CHAR from queue when a menu gets VK_ESCAPE and add tests
by Alexandre Julliard 30 Jan '17

30 Jan '17

Fabian Maurer <dark.shadow4(a)web.de> writes: > @@ -3186,8 +3186,12 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, > break; > > case VK_ESCAPE: > + { > + MSG msg_dummy; > fEndMenu = MENU_KeyEscape(&mt, wFlags); > - break; > + PeekMessageW(&msg_dummy, 0, WM_CHAR, WM_CHAR, PM_REMOVE); > + break; > + } It would be cleaner to avoid TranslateMessage instead of removing the message (possibly getting the wrong one). -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: [PATCH resend 1/2] user32: Fix WM_NCPAINT for windows crossing screen boarders and add tests
by Alexandre Julliard 30 Jan '17

30 Jan '17

Fabian Maurer <dark.shadow4(a)web.de> writes: > @@ -662,7 +662,17 @@ static HRGN send_ncpaint( HWND hwnd, HWND *child, UINT *flags ) > if (type == SIMPLEREGION) > { > RECT window; > + LONG screenx = GetSystemMetrics(SM_CXSCREEN); > + LONG screeny = GetSystemMetrics(SM_CYSCREEN); > + > GetWindowRect( hwnd, &window ); > + > + /* Clamp the window region to screen bounds */ > + if(window.right > screenx) window.right = screenx; > + if(window.bottom > screeny) window.bottom = screeny; > + if(window.left < 0) window.left = 0; > + if(window.top < 0) window.top = 0; This won't be correct for multi-monitor setups. That sort of thing should probably be handled on the server side. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 06/10] wined3d: Add compute shaders initial support in GLSL backend.
by Józef Kucia 30 Jan '17

30 Jan '17

On Sun, Jan 29, 2017 at 2:43 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > - if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_VERTEX)) && ctx_data->glsl_program) > + cshader = state->shader[WINED3D_SHADER_TYPE_COMPUTE]; > + if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE)) > + && ctx_data->glsl_program->cs.id) > { > - vs_id = ctx_data->glsl_program->vs.id; > - vs_list = &ctx_data->glsl_program->vs.shader_entry; > + cs_id = ctx_data->glsl_program->cs.id; > + } > + else if (cshader) > + { > + struct cs_compile_args args; > > - if (use_vs(state)) > + find_cs_compile_args(state, cshader, &args); > + cs_id = find_glsl_compute_shader(context, priv, cshader, &args); > + } > + > + if(!cs_id) > + { > + if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_VERTEX)) && ctx_data->glsl_program) > + { > + vs_id = ctx_data->glsl_program->vs.id; > + vs_list = &ctx_data->glsl_program->vs.shader_entry; > + > + if (use_vs(state)) > + vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX]; > + } > + else if (use_vs(state)) > { > + struct vs_compile_args vs_compile_args; > + > vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX]; > + > + find_vs_compile_args(state, vshader, context->stream_info.swizzle_map, &vs_compile_args, d3d_info); > + vs_id = find_glsl_vshader(context, priv, vshader, &vs_compile_args); > + vs_list = &vshader->linked_programs; > + } > + else if (priv->vertex_pipe == &glsl_vertex_pipe) > + { > + struct glsl_ffp_vertex_shader *ffp_shader; > + struct wined3d_ffp_vs_settings settings; > + > + wined3d_ffp_get_vs_settings(context, state, &settings); > + ffp_shader = shader_glsl_find_ffp_vertex_shader(priv, gl_info, &settings); > + vs_id = ffp_shader->id; > + vs_list = &ffp_shader->linked_programs; > + } > + > + if (use_vs(state)) > + { It doesn't seem reasonable to create a GL program for each combination of graphics pipeline and compute pipeline shaders. A single GL program for each compute shader is enough.

1 0

Re: [PATCH 07/10] wined3d: Add dispatch_compute() draw primitive.
by Józef Kucia 30 Jan '17

30 Jan '17

On Sun, Jan 29, 2017 at 2:43 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > + if (!context_apply_draw_state(context, device, state)) > + { > + context_release(context); > + WARN("Unable to apply draw state, skipping draw.\n"); > + return; > + } I don't think it makes sense to apply all states for compute pipeline. Note that graphics pipeline and compute pipeline have separate UAV bindings.

1 0

Re: [PATCH 08/10] wined3d: Dispatch compute through the command stream.
by Józef Kucia 30 Jan '17

30 Jan '17

On Sun, Jan 29, 2017 at 2:43 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > + for (i = 0; i < ARRAY_SIZE(state->streams); ++i) > + { > + if (state->streams[i].buffer) > + wined3d_resource_acquire(&state->streams[i].buffer->resource); > + } > + for (i = 0; i < ARRAY_SIZE(state->textures); ++i) > + { > + if (state->textures[i]) > + wined3d_resource_acquire(&state->textures[i]->resource); > + } Streams and textures are not supposed to be used by compute pipeline.

1 0

Re: [PATCH 05/10] wined3d: Add compute shaders cb/samplers state updates.
by Józef Kucia 30 Jan '17

30 Jan '17

FWIW, I have a patch series adding basic support for compute shaders in my patch queue. I should start submitting the series when my SM5 shader instructions series from wine-patches is committed. I've skimmed over your patches though. I'll share some high-level comments. On Sun, Jan 29, 2017 at 2:43 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> > --- > dlls/wined3d/context.c | 1 + > dlls/wined3d/state.c | 3 +++ > 2 files changed, 4 insertions(+) > > diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c > index ca73bcc..eaae0b8 100644 > --- a/dlls/wined3d/context.c > +++ b/dlls/wined3d/context.c > @@ -3382,6 +3382,7 @@ static void context_bind_shader_resources(struct wined3d_context *context, const > { > {WINED3D_SHADER_TYPE_PIXEL, 0, MAX_FRAGMENT_SAMPLERS}, > {WINED3D_SHADER_TYPE_VERTEX, MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS}, > + {WINED3D_SHADER_TYPE_COMPUTE, 0, MAX_COMPUTE_SAMPLERS}, > }; I don't think that adding a proper support for binding compute shader resources is that simple.

1 0

Re: [PATCH 1/3] wined3d: Add some missing state updates for buffer textures.
by Henri Verbeet 30 Jan '17

30 Jan '17

On 29 January 2017 at 03:32, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> > > --- > dlls/wined3d/context.c | 12 ++++++++++++ > dlls/wined3d/state.c | 5 +++++ > dlls/wined3d/view.c | 6 ------ > 3 files changed, 17 insertions(+), 6 deletions(-) > These patches are incredibly unappealing to review. There are multiple versions of multiple interleaved series, with html and other errors mixed in. (See e.g. https://source.winehq.org/patches/data/129296.) Please only send a reasonable number of patches at once, I'd suggest sticking with 5, and please use git send-email for sending patches.

1 0

Re: patches: Display multiple check marks for multiple signoffs.
by André Hentschel 30 Jan '17

30 Jan '17

Hi, > --- a/patches/update > +++ b/patches/update > @@ -229,7 +229,7 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k > } > if (defined($patch->{"signoff"})) > { > - printf INDEX "<td class=\"checkmark\" onclick=\"toggle_display('$file.signoff')\">✓</td>"; > + printf INDEX "<td class=\"checkmark\" onclick=\"toggle_display('$file.signoff')\">%s</td>", "✓" x @{$patch->{"signoff"}}; > } The patch is definitly an improvement, but the problem with the patch is, that right now I can't see that my patch has been signed-off by Aric when looking at it in the patch list ... 129264 New Aric Stewart Re: usp10: Fix ScriptRecordDigitSubstitution spec file entry ✓ ... 129183 Assigned André Hentschel usp10: Fix ScriptRecordDigitSubstitution spec file entry Aric Stewart ✓ ... I think something like that was what Bruno is looking for

3 4

Re: [PATCH] winbase.h: Add UnlockResource prototype
by Dmitry Timoshkov 30 Jan '17

30 Jan '17

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > This function is obsolete and was only used in win16. However when trying > to compile a project with winelib found this function was called. Then you need to add it to an appropriate win16 header, or better remove it from your project since it won't compile with PSDK either. -- Dmitry.

2 1

Re: [PATCH 1/7] regedit: Use a helper for LoadString() and add debug information
by Dmitry Timoshkov 30 Jan '17

30 Jan '17

Hugh McMaster <hugh.mcmaster(a)outlook.com> wrote: > -static INT vmessagebox(HWND hwnd, INT buttons, INT titleId, INT resId, va_list ap) > +static void load_string(unsigned int msg_id, WCHAR *buf, unsigned int count) > { > static const WCHAR errorW[] = {'E','r','r','o','r',0}; > - static const WCHAR unknownW[] = {'U','n','k','n','o','w','n',' ','e','r','r','o','r',' ','s','t','r','i','n','g','!',0}; > > + if (!buf) return; > + > + if (!LoadStringW(hInst, msg_id, buf, count)) > + { > + WINE_FIXME("LoadString failed with %u\n", GetLastError()); > + lstrcpyW(buf, errorW); > + } > +} Probably using a flavour of lstrcpy that checks the target buffer length would be more appropriate. Although simply returning an empty buffer and an error indicator to the caller could be slightly better. Under which conditions LoadString may fail here? -- Dmitry.

2 2

Re: [PATCH] MAINTAINERS: Add myself for printing
by Bruno Jesus 29 Jan '17

29 Jan '17

On Sun, Jan 29, 2017 at 8:15 PM, Detlef Riekenberg <wine.dev(a)web.de> wrote: > -- > bye bye Detlef > > Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> > --- > MAINTAINERS | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/MAINTAINERS b/MAINTAINERS > index e5224ff..d53af50 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -206,10 +206,15 @@ F: dlls/vcomp*/ > > Printing > M: Huw Davies <huw(a)codeweavers.com> > +P: Detlef Riekenberg <wine.dev(a)web.de> > F: dlls/localspl/ > -F: dlls/wineps.drv/ > +F: dlls/spoolss/ > F: dlls/winspool.drv/ > > +Postscript Driver > +M: Huw Davies <huw(a)codeweavers.com> > +F: dlls/wineps.drv/ > + I believe we are trying to keep the areas in alphabetical order.

1 0

Re: [v2 PATCH 3/3] windowscodecs: Add support for palette image formats to PNG encoder.
by Vincent Povirk 29 Jan '17

29 Jan '17

> + else > + { > + png_palette[i].red = 0; > + png_palette[i].green = 0; > + png_palette[i].blue = 0; > + } Why is it necessary to pad the palette in this way? Couldn't you just pass the appropriate number of colors?

3 2

Re: [PATCH] wined3d: Recognize SM5 dcl_resource_raw instruction.
by guillaume.charifi＠sfr.fr 29 Jan '17

29 Jan '17

Yes, you're right, I forgot to commit the declaration of raw_resource in wined3d_private.<br> And yes, it can be replaced by dst instead. <div class="gl_quote" style="margin-top: 20px; padding-top: 5px;"> <div class="gl_quoted">On Sun, Jan 29, 2017 at 11:52 AM, Guillaume Charifi<br> wrote:<br> > Signed-off-by: Guillaume Charifi<br> > ---<br> > dlls/wined3d/arb_program_shader.c | 1 +<br> > dlls/wined3d/glsl_shader.c | 1 +<br> > dlls/wined3d/shader.c | 6 ++++++<br> > dlls/wined3d/shader_sm4.c | 10 ++++++++++<br> > dlls/wined3d/wined3d_private.h | 1 +<br> > 5 files changed, 19 insertions(+)<br> <br> This patch doesn't even compile. Please test your patches before<br> sending them to wine-patches.<br> <br> > +static void shader_sm5_read_dcl_resource_raw(struct wined3d_shader_instruction *ins,<br> > + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count,<br> > + struct wined3d_sm4_data *priv)<br> > +{<br> > + shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_RESOURCE, &ins->declaration.raw_resource.reg);<br> > +}<br> <br> You should just use "ins->declaration.dst".</div> </div>

1 0

Re: [PATCH] wined3d: Recognize SM5 dcl_resource_raw instruction.
by Józef Kucia 29 Jan '17

29 Jan '17

On Sun, Jan 29, 2017 at 11:52 AM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> > --- > dlls/wined3d/arb_program_shader.c | 1 + > dlls/wined3d/glsl_shader.c | 1 + > dlls/wined3d/shader.c | 6 ++++++ > dlls/wined3d/shader_sm4.c | 10 ++++++++++ > dlls/wined3d/wined3d_private.h | 1 + > 5 files changed, 19 insertions(+) This patch doesn't even compile. Please test your patches before sending them to wine-patches. > +static void shader_sm5_read_dcl_resource_raw(struct wined3d_shader_instruction *ins, > + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, > + struct wined3d_sm4_data *priv) > +{ > + shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_RESOURCE, &ins->declaration.raw_resource.reg); > +} You should just use "ins->declaration.dst".

1 0

Re: [PATCH] wined3d: Implement buffer texture range.
by Józef Kucia 29 Jan '17

29 Jan '17

Please add a test. On Sun, Jan 29, 2017 at 12:25 AM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > + GL_EXTCALL(glTexBufferRange(GL_TEXTURE_BUFFER, view_format->glInternal, buffer->buffer_object, > + desc->u.buffer.start_idx, desc->u.buffer.count)); This is wrong.

1 0

RE : [PATCH] wined3d: Implement buffer texture range.
by Guillaume Charifi 29 Jan '17

29 Jan '17

Woops, I forgot the patch adding the required extension, I'll send it later.

1 0

RE : Re: [PATCH 1/3] wined3d: Add some missing state updates for buffer textures.
by Guillaume Charifi 29 Jan '17

29 Jan '17

Right, thank you... -------- Message d'origine -------- De : Bruno Jesus <00cpxxx(a)gmail.com> Date :29/01/2017 03:13 (GMT+01:00) À : Guillaume Charifi Cc : Wine Develop Objet : Re: [PATCH 1/3] wined3d: Add some missing state updates for buffer textures. On Sat, Jan 28, 2017 at 8:46 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > --- > dlls/wined3d/context.c | 12 ++++++++++++ > dlls/wined3d/state.c | 5 +++++ > dlls/wined3d/view.c | 6 ------ > 3 files changed, 17 insertions(+), 6 deletions(-) You missed the Signed-off-by, see the red marks at http://source.winehq.org/patches/

1 0

Re: [PATCH 1/3] wined3d: Add some missing state updates for buffer textures.
by Bruno Jesus 29 Jan '17

29 Jan '17

On Sat, Jan 28, 2017 at 8:46 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > --- > dlls/wined3d/context.c | 12 ++++++++++++ > dlls/wined3d/state.c | 5 +++++ > dlls/wined3d/view.c | 6 ------ > 3 files changed, 17 insertions(+), 6 deletions(-) You missed the Signed-off-by, see the red marks at http://source.winehq.org/patches/

1 0

Re: [PATCH v3 1/4] ddraw: Don't crash if writing out a new ddraw1 surface segfaults.
by Marvin 28 Jan '17

28 Jan '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=28113 Your paranoid android. === w1064 (32 bit ddraw1) === ddraw1.c:1662: Test failed: Got unexpected color 0x000000ff.

1 0

Re: [PATCH v3 1/4] ddraw: Don't crash if writing out a new ddraw1 surface segfaults.
by Sebastian Lackner 28 Jan '17

28 Jan '17

On 28.01.2017 22:59, Alex Henrie wrote: > + __TRY > { > - *surface = NULL; > - return hr; > + if (FAILED(hr)) > + { > + *surface = NULL; > + return hr; > + } Its not possible to use return in a __TRY block.

1 0

Re: [PATCH 1/5] wined3d: Fix sRGB clears with no support for ARB_framebuffer_sRGB.
by Henri Verbeet 27 Jan '17

27 Jan '17

On 27 January 2017 at 19:52, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > - if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && needs_srgb_write(context, state, fb)) > + if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] > + && ((!(context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) > + && fb->render_targets[0] && fb->render_targets[0]->format_flags & WINED3DFMT_FLAG_SRGB_WRITE) > + || state->render_states[WINED3D_RS_SRGBWRITEENABLE])) I think this looks suspicious, why is this more correct? In particular, wouldn't this enable sRGB clears on formats without WINED3DFMT_FLAG_SRGB_WRITE? Patch 2/5 hints that that may be intentional, but in that case, shouldn't this be independent of ARB_framebuffer_sRGB support?

2 3

Re: [PATCH v2 1/4] ddraw: Don't write out if a ddraw1 surface of size 0 is requested.
by Alex Henrie 27 Jan '17

27 Jan '17

2017-01-27 5:43 GMT-07:00 Henri Verbeet <hverbeet(a)gmail.com>: > On 26 January 2017 at 06:20, Alex Henrie <alexhenrie24(a)gmail.com> wrote: >> + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); >> + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); >> + ok(surface == (IDirectDrawSurface *)0xdeadbeef || broken(!surface) /* 32-bit on Win8/10 */, >> + "Got unexpected surface %p.\n", surface); > Where does this pass without the broken()? It writes NULL to surface > for me on Windows 7, and appears to handle the exception when an > invalid pointer is passed in. http://testbot.winehq.org/JobDetails.pl?Key=28086 The following testbot VMs are the only ones that zero out the surface pointer: w8 (32 bit ddraw1) w864 (32 bit ddraw1) w1064 (32 bit ddraw1) Maybe the behavior of newer versions of Windows depends on the video card driver? -Alex ---------- Forwarded message ---------- From: Marvin <testbot(a)winehq.org> Date: 2017-01-27 10:00 GMT-07:00 Subject: TestBot job 28086 results: ddraw: Don't write out if a ddraw1 surface of size 0 is requested. To: Alex Henrie <alexhenrie24(a)gmail.com> VM Status Number of test failures build completed wxppro completed 0 w2003std completed 0 wvistau64 completed 0 w2008s64 completed 0 w7u completed 0 w7pro64 completed 0 w8 completed 1 w864 completed 1 w1064 completed 2 wvistau64 completed 0 w2008s64 completed 0 w7pro64 completed 0 w864 completed 0 w1064 completed 1 === build (build) === No build failures found === wxppro (32 bit ddraw1) === No test failures found === w2003std (32 bit ddraw1) === No test failures found === wvistau64 (32 bit ddraw1) === No test failures found === w2008s64 (32 bit ddraw1) === No test failures found === w7u (32 bit ddraw1) === No test failures found === w7pro64 (32 bit ddraw1) === No test failures found === w8 (32 bit ddraw1) === ddraw: ddraw1.c:1971: Test failed: Got unexpected surface 00000000. === w864 (32 bit ddraw1) === ddraw: ddraw1.c:1971: Test failed: Got unexpected surface 00000000. === w1064 (32 bit ddraw1) === ddraw: ddraw1.c:1971: Test failed: Got unexpected surface 00000000. ddraw1.c:2299: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === wvistau64 (64 bit ddraw1) === No test failures found === w2008s64 (64 bit ddraw1) === No test failures found === w7pro64 (64 bit ddraw1) === No test failures found === w864 (64 bit ddraw1) === No test failures found === w1064 (64 bit ddraw1) === ddraw: ddraw1.c:2299: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768).

2 1

Re: [PATCH] d3dx11: Add D3DX11CreateShaderResourceViewFromMemory stub. (resend)
by Matteo Bruni 27 Jan '17

27 Jan '17

2017-01-25 12:19 GMT+01:00 Andrey Gusev <andrey.goosev(a)gmail.com>: > Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> > --- > dlls/d3dx11_42/Makefile.in | 1 + > dlls/d3dx11_42/d3dx11_42.spec | 2 +- > dlls/d3dx11_43/Makefile.in | 1 + > dlls/d3dx11_43/d3dx11_43.spec | 2 +- > dlls/d3dx11_43/shader.c | 36 ++++++++++++++++++++++++++++++++++++ > 5 files changed, 40 insertions(+), 2 deletions(-) > create mode 100644 dlls/d3dx11_43/shader.c I had a better look at the patch and unfortunately I don't think this is okay as is. Sorry that I missed it the first time around. The D3DX11CreateShaderResourceViewFrom* functions are probably supposed to be very thin wrappers over the corresponding D3DX11CreateTextureFrom* functions. So e.g. for D3DX11CreateShaderResourceViewFromMemory() an implementation calling D3DX11CreateTextureFromMemory() and then ID3D11Device_CreateShaderResourceView(device, ...) on the returned resource is probably all there is to it. Except that, for the pump != NULL case, you want to do the work on the thread pump so e.g. create the the SRV in a ID3DX11DataProcessor. Anyway, it's still okay to me to go with just a stub or with an implementation only taking into account the !pump case. You need to add the function definition to d3dx11tex.h though. Also, given that this is really a texture function, it doesn't make sense to put it in a new shader.c file. Just adding it to texture.c seems fine.

1 0

Re: opengl32: add OpenGL 3.3/4.0 extensions
by Vito Paradiso 27 Jan '17

27 Jan '17

i quite didn’t understand > Il giorno 16 gen 2017, alle ore 22:49, Marvin <testbot(a)winehq.org> ha scritto: > > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "No patch". > > This means that no patch was found in your mail. > > If you do not understand the reason for this status, disagree with our > assessment, or are simply not sure how to proceed next, please ask for > clarification by replying to this email.

1 0

Re: [PATCH] d3d8/tests: Fix copy&paste issue in compare_mode (cppcheck)
by Henri Verbeet 27 Jan '17

27 Jan '17

On 27 January 2017 at 05:58, Bruno Jesus <00cpxxx(a)gmail.com> wrote: > - unsigned int h = mode_b->h - mode_b->h; > + unsigned int h = mode_a->h - mode_b->h; This is correct of course, but I'd hesitate to call copy/paste on it.

1 0

Re: [PATCH v2 1/4] ddraw: Don't write out if a ddraw1 surface of size 0 is requested.
by Henri Verbeet 27 Jan '17

27 Jan '17

On 26 January 2017 at 06:20, Alex Henrie <alexhenrie24(a)gmail.com> wrote: > + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); > + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); > + ok(surface == (IDirectDrawSurface *)0xdeadbeef || broken(!surface) /* 32-bit on Win8/10 */, > + "Got unexpected surface %p.\n", surface); Where does this pass without the broken()? It writes NULL to surface for me on Windows 7, and appears to handle the exception when an invalid pointer is passed in.

1 0

Re: ntprint: Fix PSetupCreateMonitorInfo spec file entry
by Huw Davies 27 Jan '17

27 Jan '17

On Thu, Jan 26, 2017 at 11:46:57PM +0100, André Hentschel wrote: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > dlls/ntprint/ntprint.spec | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > > diff --git a/dlls/ntprint/ntprint.spec b/dlls/ntprint/ntprint.spec > index 8869776..3687979 100644 > --- a/dlls/ntprint/ntprint.spec > +++ b/dlls/ntprint/ntprint.spec > @@ -2,7 +2,7 @@ > @ stub PSetupAssociateICMProfiles > @ stub PSetupBuildDriversFromPath > @ stub PSetupCreateDrvSetupPage > -@ stdcall PSetupCreateMonitorInfo(long ptr ptr) > +@ stdcall PSetupCreateMonitorInfo(ptr ptr ptr) > @ stub PSetupCreatePrinterDeviceInfoList > @ stub PSetupDestroyDriverInfo3 > @ stdcall PSetupDestroyMonitorInfo(long) > I get exceptions running the tests on 32-bit Windows (with or without this patch) which go away when I call the function with just two arguments - I suspect we should lose the third argument. Huw.

1 0

Re: ntdll: add a stub for NtLoadKey2/ZwLoadKey2
by Dmitry Timoshkov 27 Jan '17

27 Jan '17

Austin English <austinenglish(a)gmail.com> wrote: > +NTSTATUS WINAPI NtLoadKey2(OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *file, ULONG flags) > +{ > + NTSTATUS ret; > + > + FIXME("(%p,%p,0x%08x) semi-stub: ignoring flags\n", attr, file, flags); > + ret = NtLoadKey(attr, file); > + > + return ret; > +} There is no need for an intermediate variable. -- Dmitry.

1 0

Re: [PATCH 3/3] windowscodecs: Use source palette if it wasn't specified earlier for PNG frame
by Dmitry Timoshkov 27 Jan '17

27 Jan '17

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > @@ -1765,6 +1765,18 @@ static HRESULT WINAPI PngFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, > > if (SUCCEEDED(hr)) > { > + if (This->colors == 0) > + { > + IWICPalette *palette; > + > + if (SUCCEEDED(PaletteImpl_Create(&palette))) > + { > + if (SUCCEEDED(IWICBitmapSource_CopyPalette(pIBitmapSource, palette))) > + IWICBitmapFrameEncode_SetPalette(iface, palette); > + IWICPalette_Release(palette); > + } > + } > + > hr = write_source(iface, pIBitmapSource, prc, > This->format->guid, This->format->bpp, This->width, This->height); > } What is this for? It looks like a workaround for a WIC converter bug. I'd like to see a test case for this behaviour. -- Dmitry.

1 0

Re: [PATCH 1/3] windowscodecs: Implement IWICBitmapFrameEncode::SetPalette in PNG encoder.
by Dmitry Timoshkov 27 Jan '17

27 Jan '17

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > From: Dmitry Timoshkov <dmitry(a)baikal.ru> ... > diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c > index 2af985785c..9da82f1665 100644 > --- a/dlls/windowscodecs/tests/converter.c > +++ b/dlls/windowscodecs/tests/converter.c > @@ -25,6 +25,7 @@ > #include "windef.h" > #include "objbase.h" > #include "wincodec.h" > +#include "wincodecsdk.h" > #include "wine/test.h" > > typedef struct bitmap_data { > @@ -577,6 +578,50 @@ struct setting { > void *value; > }; > > +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) > +static void _expect_ref(IUnknown* obj, ULONG ref, int line) I'd prefer to avoid getting a credit for the code I never had written. -- Dmitry.

1 0

Re: [v3 PATCH 05/10] x86/insn-kernel: Add support to resolve 16-bit addressing encodings (fwd)
by Julia Lawall 27 Jan '17

27 Jan '17

Check the type of seg on line 267. julia ---------- Forwarded message ---------- Date: Thu, 26 Jan 2017 05:24:40 +0800 From: kbuild test robot <fengguang.wu(a)intel.com> To: kbuild(a)01.org Cc: Julia Lawall <julia.lawall(a)lip6.fr> Subject: Re: [v3 PATCH 05/10] x86/insn-kernel: Add support to resolve 16-bit addressing encodings In-Reply-To: <20170125202353.101059-6-ricardo.neri-calderon(a)linux.intel.com> Hi Ricardo, [auto build test WARNING on tip/auto-latest] [also build test WARNING on v4.10-rc5 next-20170125] [cannot apply to tip/x86/core] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Ricardo-Neri/x86-Enable-User-Mode-… :::::: branch date: 51 minutes ago :::::: commit date: 51 minutes ago >> arch/x86/lib/insn-kernel.c:267:6-9: WARNING: Unsigned expression compared with zero: seg < 0 git remote add linux-review https://github.com/0day-ci/linux git remote update linux-review git checkout 574de0de238ef30c816985006f02f7a1dbba92aa vim +267 arch/x86/lib/insn-kernel.c 574de0de Ricardo Neri 2017-01-25 251 addr = (seg << 4) + regs_get_register(regs, addr_offset1); 574de0de Ricardo Neri 2017-01-25 252 } else { 574de0de Ricardo Neri 2017-01-25 253 ret = get_reg_offset_16(insn, regs, &addr_offset1, 574de0de Ricardo Neri 2017-01-25 254 &addr_offset2); 574de0de Ricardo Neri 2017-01-25 255 if (ret < 0) 574de0de Ricardo Neri 2017-01-25 256 goto out_err; 574de0de Ricardo Neri 2017-01-25 257 /* 574de0de Ricardo Neri 2017-01-25 258 * Don't fail on invalid offset values. They might be invalid 574de0de Ricardo Neri 2017-01-25 259 * because they are not supported. Instead, use them in the 574de0de Ricardo Neri 2017-01-25 260 * calculation only if they contain a valid value. 574de0de Ricardo Neri 2017-01-25 261 */ 574de0de Ricardo Neri 2017-01-25 262 if (addr_offset1 >= 0) 574de0de Ricardo Neri 2017-01-25 263 addr1 = regs_get_register(regs, addr_offset1); 574de0de Ricardo Neri 2017-01-25 264 if (addr_offset2 >= 0) 574de0de Ricardo Neri 2017-01-25 265 addr2 = regs_get_register(regs, addr_offset2); 574de0de Ricardo Neri 2017-01-25 266 seg = __get_segment_selector_16(regs, insn, addr_offset1); 574de0de Ricardo Neri 2017-01-25 @267 if (seg < 0) 574de0de Ricardo Neri 2017-01-25 268 goto out_err; 574de0de Ricardo Neri 2017-01-25 269 addr = (seg << 4) + addr1 + addr2; 574de0de Ricardo Neri 2017-01-25 270 } 574de0de Ricardo Neri 2017-01-25 271 addr += insn->displacement.value; 574de0de Ricardo Neri 2017-01-25 272 574de0de Ricardo Neri 2017-01-25 273 return (void __user *)addr; 574de0de Ricardo Neri 2017-01-25 274 out_err: 574de0de Ricardo Neri 2017-01-25 275 return (void __user *)-1; --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

2 1

Re: comctl32: Move prototype to header
by Sebastian Lackner 26 Jan '17

26 Jan '17

On 27.01.2017 00:26, André Hentschel wrote: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > dlls/comctl32/comctl32.h | 1 + > dlls/comctl32/syslink.c | 2 -- > 2 files changed, 1 insertion(+), 2 deletions(-) > Any specific reason that you don't use include/shlwapi.h ?

2 1

Re: msvideo.dll16: Implement DrawDibProfileDisplay
by Alexandre Julliard 26 Jan '17

26 Jan '17

Bruno Jesus <00cpxxx(a)gmail.com> writes: > @@ -35,7 +35,7 @@ > 111 stub DRAWDIBCHANGEPALETTE > 112 pascal -ret16 DrawDibRealize(word word word) DrawDibRealize16 > 113 stub DRAWDIBTIME > -114 stub DRAWDIBPROFILEDISPLAY > +114 pascal -ret16 DrawDibProfileDisplay(segptr) DrawDibProfileDisplay16 segptr is not correct if you pass the pointer to 32-bit code. -- Alexandre Julliard julliard(a)winehq.org

3 3

Performance Testing Wine-1.2-rc4 vs Wine-1.8
by Stefan Dösinger 26 Jan '17

26 Jan '17

Hi, After more than a year of break I ran my Wine benchmarking scripts again on one of my two test machines: The iMac5.1 box with a Radeon X1600 GPU. You can see the results and the comparison to the last regular run here: http://openbenchmarking.org/result/1701170-RI-UPDATETES12,1512236-GA-WINE18… The one game that jumps out is Trackmania Nations. It apparently regressed from approx. 32 fps to 24. I will run a bisect in the next days to pinpoint the patch that caused this. The game itself wasn't updated. Other than TMNations there is nothing too surprising. 3DMark2000 and 2001 are slightly slower, Half Life 2 (which surprisingly didn't seem to be changed by Valve since December 2015) is slightly faster. Unigine Heaven, UT2004 and World in Conflict are unchanged. As you can see in the results I updated the kernel, Mesa and Wine separately to see where changes come from (stable interfaces ftw!). The oldkernel_oldmesa_oldwine result differs from the 2015 one in the general update of the system (KDE Desktop, X server, DDX driver, etc). Unfortunately this old machine is the less interesting one of my two test boxes. I still don't have a monitor for my Radeon HD 5700 Desktop. I ordered one a while ago and it should arrive soon. If I have time I'll try to run the tests next week. Cheers, Stefan

2 4

Re: [PATCH] hidclass.sys: When processing reads fill all the buffers
by Sebastian Lackner 26 Jan '17

26 Jan '17

On 26.01.2017 13:57, Aric Stewart wrote: > This is a follow-up fix for continuing work on bug 42225 > > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/hidclass.sys/buffer.c | 34 +++++++++++++++++++++++++++++++++- > dlls/hidclass.sys/device.c | 2 +- > dlls/hidclass.sys/hid.h | 3 ++- > 3 files changed, 36 insertions(+), 3 deletions(-) > > > > 0001-hidclass.sys-When-processing-reads-fill-all-the-buffer.txt > > > diff --git a/dlls/hidclass.sys/buffer.c b/dlls/hidclass.sys/buffer.c > index 0b29f97b69..41bbb8e241 100644 > --- a/dlls/hidclass.sys/buffer.c > +++ b/dlls/hidclass.sys/buffer.c > @@ -127,7 +127,7 @@ NTSTATUS RingBuffer_SetSize(struct ReportRingBuffer *ring, UINT size) > return STATUS_SUCCESS; > } > > -void RingBuffer_Read(struct ReportRingBuffer *ring, UINT index, void *output, UINT *size) > +void RingBuffer_ReadNew(struct ReportRingBuffer *ring, UINT index, void *output, UINT *size) > { > void *ret = NULL; > > @@ -155,6 +155,38 @@ void RingBuffer_Read(struct ReportRingBuffer *ring, UINT index, void *output, UI > } > } > > +void RingBuffer_Read(struct ReportRingBuffer *ring, UINT index, void *output, UINT *size) > +{ > + int pointer = ring->pointers[index]; > + void *ret = NULL; > + > + EnterCriticalSection(&ring->lock); > + if (index >= ring->pointer_alloc || ring->pointers[index] == POINTER_UNUSED > + || ring->end == ring->start) > + { > + LeaveCriticalSection(&ring->lock); > + *size = 0; > + return; > + } > + > + if (pointer == ring->end) > + pointer--; > + > + if (pointer < 0) > + pointer = ring->size - 1; > + > + ret = &ring->buffer[pointer * ring->buffer_size]; > + memcpy(output, ret, ring->buffer_size); > + if (pointer == ring->pointers[index]) > + { > + ring->pointers[index]++; > + if (ring->pointers[index] == ring->size) > + ring->pointers[index] = 0; > + } > + LeaveCriticalSection(&ring->lock); > + *size = ring->buffer_size; Have you been able to reproduce a similar behavior on Windows? The new code looks very suspicious and I'm not sure if this is the right approach to fix it. Also please note that this will effectively disable any asynchronous Read requests - HID_Device_read() will always use the first code path when there is at least one package in the ring buffer and never return STATUS_PENDING. > +} > + > UINT RingBuffer_AddPointer(struct ReportRingBuffer *ring) > { > UINT idx; > diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c > index b241016e72..d6a0a358e3 100644 > --- a/dlls/hidclass.sys/device.c > +++ b/dlls/hidclass.sys/device.c > @@ -662,7 +662,7 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) > ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext ); > > irp->IoStatus.Information = 0; > - RingBuffer_Read(ext->ring_buffer, ptr, packet, &buffer_size); > + RingBuffer_ReadNew(ext->ring_buffer, ptr, packet, &buffer_size); > > if (buffer_size) > { > diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h > index adc547cc43..1829319ccf 100644 > --- a/dlls/hidclass.sys/hid.h > +++ b/dlls/hidclass.sys/hid.h > @@ -62,7 +62,8 @@ typedef struct _BASE_DEVICE_EXTENSION { > void RingBuffer_Write(struct ReportRingBuffer *buffer, void *data) DECLSPEC_HIDDEN; > UINT RingBuffer_AddPointer(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; > void RingBuffer_RemovePointer(struct ReportRingBuffer *ring, UINT index) DECLSPEC_HIDDEN; > -void RingBuffer_Read(struct ReportRingBuffer *buffer, UINT index, void *output, UINT *size) DECLSPEC_HIDDEN; > +void RingBuffer_Read(struct ReportRingBuffer *ring, UINT index, void *output, UINT *size) DECLSPEC_HIDDEN; > +void RingBuffer_ReadNew(struct ReportRingBuffer *buffer, UINT index, void *output, UINT *size) DECLSPEC_HIDDEN; > UINT RingBuffer_GetBufferSize(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; > UINT RingBuffer_GetSize(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; > void RingBuffer_Destroy(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; > > >

2 1

DirectX 12 in Wine
by Gabríel Arthúr Pétursson 25 Jan '17

25 Jan '17

Hi, I am interested on working on getting DirectX 12 support into Wine. Is there anyone currently working towards that goal that I can get in contact with? With that said, what would an appropriate implementation in Wine look like? DirectX 12 on top of Vulkan seems like an obvious choice. The two APIs are very similar, whereas the DirectX 12 programming model deviates significantly from both OpenGL and DirectX 11. Another approach is to leverage wined3d (i.e. OpenGL + extensions). I don't know to what extent wined3d can be used or needs to be changed in order to support DirectX 12, or if it'd be useful at all. Can anyone shed some light on whether this would be a feasible approach? Thanks.

3 3

A couple unrelated issues
by Rafał Mużyło 25 Jan '17

25 Jan '17

Just as the title says, I've got a couple problems/questions that don't have much in common except for "happening in wine". 1. regedit and long REG_BINARY values: the edit control should either be made resizable or scrollable, cause long values just don't fit in the box; as a temporary solution, I've made a hackish patch, that changes the font the control uses (not sure if that's necesarry, but it's just feels more natural to use monospaced font here), makes sure all glyphs get the same space and once the value wraps, if it's a non-integer divide, the last line is correctly placed; 2. alsa/pulseaudio and stream recovery: as in the past, it's hard to tell if it's wine or the underlaying stuff that fails; the problem I'm hearing is that apps sometimes without any apparent reason (as CPU usage isn't all that different than the average) go into '(snd_pcm_recover) underrun occurred' mode and start playing the sounds on much higher rate and then just as randomly (as it's again seemingly not related to CPU usage) recover; it's the randomness that bothers me: both going into the state *and* not recovering for several minutes; would it be possible, if not outright fix that, then for example add a helper app, that the user could manually trigger to force recovery ? 3. err:ntdll:RtlpWaitForCriticalSection wait timed out in thread <nr>, blocked by <nr>, retrying (60 sec): this is an annoyance, sometimes a major one; namely, it happens that I terminate an app by pressing ^C; usually, that works just fine, but every now and then app goes into that unterminatable state and not for those 60 sec (which is horribly long anyway), but pretty much indefinitelly; it really shouldn't do that; this requires a taskmgr or wineboot intervention to close it 4. (somewhat related to the previous) taskmgr could use a little enhancement: when running several apps with the same executable name, it's very hard to tell (impossible ?) how a line from process tab relates to application tab; usually it's not much of a problem, but if point 3 strikes, there's no more entry in the app tab, but the process is still there and you need to guess, which will often be wrong; perhaps the entries in the process tab should print the app name or have an option in the context menu to retrieve it ?

4 6

Re: [PATCH 3/7] d3d11/tests: Add test for interleaved Draw() and Dispatch() calls.
by Henri Verbeet 25 Jan '17

25 Jan '17

On 25 January 2017 at 11:17, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > dlls/d3d11/tests/d3d11.c | 186 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 186 insertions(+) > This fails here: d3d11.c:1310: Feature level 0xb000. d3d11.c:6487: Tests skipped: Some AMD drivers have a bug affecting the test. d3d11.c:10104: Compute shader support via SM4 0x1. d3d11.c:11197: Optional format 0x59 - display supported, feature level 0xa100. d3d11.c:11197: Optional format 0x59 - display supported, feature level 0xa000. d3d11.c:12628: Test failed: Got 0x00000000, expected 0xffffffff at (0, 0), sub-resource 0. d3d11: 7402 tests executed (0 marked as todo, 1 failure), 1 skipped. It also takes a long time to run; it might be hanging the GPU.

2 1

Post-release
by Alexandre Julliard 25 Jan '17

25 Jan '17

Congrats to everybody for the 2.0 release! I'm particularly pleased with the progress we've made on fixing regressions, I didn't expect we'd get that many. Thanks all! The master branch is now open for development again. I'll go through the patches that are still in the queue, but please resend any patch that had been marked Deferred. I'll also resume the biweekly development release cycle, starting with release 2.1 on February 3rd. Despite fierce competition, Michael Stefaniuc once again took the coveted job of Stable Branch Maintainer. He'll be making regular 2.0.x releases. I've also implemented the patch reviewer assignment scheme that we discussed at WineConf. From now on, patches that stay in the queue unreviewed for a week will be assigned a reviewer automatically. The algorithm is prioritizing people who said they have some knowledge about the area (the P: entries in the MAINTAINERS file), before grabbing someone at random from the wildcard entry. If you feel that there are areas where you could help reviewing patches, but don't feel comfortable putting yourself up as maintainer, please consider adding an entry for yourself as a knowledgeable person. If you are asked to review a patch, and you think it looks good but don't feel that you know enough to sign off on it, please just send a reply saying "looks OK to me" or something like that. I may then ask someone else to have a further look, or do it myself. Any review helps, even without a full signoff. Looking forward to 3.0 :-) -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: rstrtmgr: add RmShutdown stub (resend)
by Sebastian Lackner 25 Jan '17

25 Jan '17

On 25.01.2017 06:28, Austin English wrote: > CC: Sebastian Lackner <sebastian(a)fds-team.de> > > Supersedes https://source.winehq.org/patches/data/128639 > > Fixes https://bugs.winehq.org/show_bug.cgi?id=42093 > > Staged, https://github.com/wine-compholio/wine-staging/commit/b013afa66065427110c02… > > -- -Austin GPG: 14FB D7EA A041 937B > > > 0001-rstrtmgr-add-RmShutdown-stub-resend.patch > > > From fab99f2f9e398978461af053b38aa9b06b7bdc1d Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Wed, 28 Dec 2016 02:18:13 -0600 > Subject: [PATCH] rstrtmgr: add RmShutdown stub (resend) > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > dlls/rstrtmgr/main.c | 9 +++++++++ > dlls/rstrtmgr/rstrtmgr.spec | 2 +- > include/restartmanager.h | 3 +++ > 3 files changed, 13 insertions(+), 1 deletion(-) > > diff --git a/dlls/rstrtmgr/main.c b/dlls/rstrtmgr/main.c > index 2d45639..5c9a8dc 100644 > --- a/dlls/rstrtmgr/main.c > +++ b/dlls/rstrtmgr/main.c > @@ -100,3 +100,12 @@ DWORD WINAPI RmEndSession(DWORD handle) > FIXME("%u stub!\n", handle); > return ERROR_CALL_NOT_IMPLEMENTED; > } > + > +/*********************************************************************** > + * RmShutdown (rstrtmgr.@) > + */ > +DWORD WINAPI RmShutdown(DWORD handle, ULONG flags, RM_WRITE_STATUS_CALLBACK status) > +{ > + FIXME("%u, 0x%08x, %p stub!\n", handle, flags, status); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > diff --git a/dlls/rstrtmgr/rstrtmgr.spec b/dlls/rstrtmgr/rstrtmgr.spec > index 0e1ba79..6c6a9c9 100644 > --- a/dlls/rstrtmgr/rstrtmgr.spec > +++ b/dlls/rstrtmgr/rstrtmgr.spec > @@ -8,5 +8,5 @@ > @ stub RmRemoveFilter > @ stub RmReserveHeap > @ stdcall RmRestart(long long ptr) > -@ stub RmShutdown > +@ stdcall RmShutdown(long long ptr) > @ stdcall RmStartSession(ptr long ptr) > diff --git a/include/restartmanager.h b/include/restartmanager.h > index 27c1a92..51867a3 100644 > --- a/include/restartmanager.h > +++ b/include/restartmanager.h > @@ -64,6 +64,9 @@ typedef struct { > BOOL bRestartable; > } RM_PROCESS_INFO, *PRM_PROCESS_INFO; > > + > +typedef void *RM_WRITE_STATUS_CALLBACK(UINT); The calling convention is missing here, please see the staged version how it should look like. > + > #ifdef __cplusplus > } > #endif > -- 2.10.2 >

1 0

Re: [resend 2/3] ntdll: Implement FileIdInformation class support in NtQueryInformationFile.
by Sebastian Lackner 25 Jan '17

25 Jan '17

On 25.01.2017 04:57, Jonathan Doron wrote: > + ((PLARGE_INTEGER)&info->VolumeSerialNumber)->LowPart = (ULONG)volstats.f_fsid.__val[0]; > + ((PLARGE_INTEGER)&info->VolumeSerialNumber)->HighPart = (ULONG)volstats.f_fsid.__val[1]; Accessing members of f_fsid is not cross-platform compatible - you will either have to find a better way to get this information, or at least add corresponding checks to configure.ac. For more information see: https://linux.die.net/man/2/fstatfs """Nobody knows what f_fsid is supposed to contain (but see below).""" """Solaris, Irix and POSIX have a system call statvfs(2) that returns a struct statvfs (defined in <sys/statvfs.h>) containing an unsigned long f_fsid. Linux, SunOS, HP-UX, 4.4BSD have a system call statfs() that returns a struct statfs (defined in <sys/vfs.h>) containing a fsid_t f_fsid, where fsid_t is defined as struct { int val[2]; }."""

1 0

Re: [PATCH resend] user32: Also remove WM_CHAR from queue when a menu gets VK_ESCAPE and add tests
by Dmitry Timoshkov 25 Jan '17

25 Jan '17

Fabian Maurer <dark.shadow4(a)web.de> wrote: > +/* Test handling of VK_ESCAPE to close the menu */ > +static LRESULT WINAPI esc_test_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) > +{ > + if(msg == WM_SHOWWINDOW) > + { > + PostMessageW(hwnd, WM_KEYDOWN, VK_ESCAPE, 0); > + HMENU hPopupMenu = CreatePopupMenu(); > + InsertMenuA(hPopupMenu, 0, MF_STRING, 10, "test"); > + TrackPopupMenu(hPopupMenu, 0, 0, 0, 0, hwnd, NULL); > + PostQuitMessage(0); > + } > + > + if(msg == WM_CHAR || msg == WM_KEYDOWN) > + ok(0, "Wrong VK_ESCAPE press detected.\n"); > + > + return DefWindowProcA(hwnd, msg, wparam, lparam); > +} Please add a test to msg.c instead. This should be a normal TrackPopupMenu test not wrapped inside of a parent's WM_SHOWWINDOW message handler. Once there is a message test, and the underlying behaviour is well understood a patch with a fix could be sent separately. -- Dmitry.

1 0

Re: [PATCH] gdi32: Add traces for painting functions
by Huw Davies 25 Jan '17

25 Jan '17

On Sat, Jan 21, 2017 at 06:45:31PM +0100, Fabian Maurer wrote: > Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> > --- > dlls/gdi32/painting.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++---- > 1 file changed, 52 insertions(+), 4 deletions(-) I would suggest printing the point-like terms in the same way as wine_dbgstr_point() and the rect-like terms in the same way as wine_dbgstr_rect(). > @@ -237,6 +237,8 @@ BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) > PHYSDEV physdev; > BOOL ret; > > + TRACE( "%p, %d, %d\n", hdc, x, y ); So this would be: TRACE( "%p, (%d,%d)\n", hdc, x, y ); > @@ -288,6 +292,8 @@ BOOL WINAPI Arc( HDC hdc, INT left, INT top, INT right, > BOOL ret; > DC * dc = get_dc_ptr( hdc ); > > + TRACE( "%p, %d, %d, %d, %d, %d, %d, %d, %d\n", hdc, left, top, right, bottom, xstart, ystart, xend, yend ); And this would be: TRACE( "%p, (%d,%d)-(%d,%d), (%d,%d), (%d,%d)\n", hdc, left, top, right, bottom, xstart, ystart, xend, yend ); > @@ -421,6 +437,8 @@ BOOL WINAPI RoundRect( HDC hdc, INT left, INT top, INT right, > BOOL ret; > DC *dc = get_dc_ptr( hdc ); > > + TRACE( "%p, %d, %d, %d, %d, %d, %d\n", hdc, left, top, right, bottom, ell_width, ell_height ); A size-like term could be: TRACE( "%p, (%d,%d)-(%d,%d), %dx%d\n", hdc, left, top, right, bottom, ell_width, ell_height ); > @@ -702,6 +738,8 @@ BOOL WINAPI ExtFloodFill( HDC hdc, INT x, INT y, COLORREF color, > BOOL ret; > DC * dc = get_dc_ptr( hdc ); > > + TRACE( "%p, %d, %d, %x, %x\n", hdc, x, y, color, fillType ); color should be %08x Huw.

2 1

Code freeze
by Fabian Maurer 25 Jan '17

25 Jan '17

Hello, Now that wine 2.0 is released, does this mark the end of code-freeze or should we still wait before sending in patches like normally? Regards, Fabian

2 1

Re: [PATCH] shell32: Implement knownfolder_GetRedirectionCapabilities somewhat
by Nikolay Sivov 24 Jan '17

24 Jan '17

On 23.01.2017 23:10, Enrico Horn wrote: > This is the one thing missing to get the config app for Temple+, a > Temple of Elemental Evil Mod, starting. > --- > dlls/shell32/shellpath.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c > index 92306239db7..3c44ecb393a 100644 > --- a/dlls/shell32/shellpath.c > +++ b/dlls/shell32/shellpath.c > @@ -5396,8 +5396,9 @@ static HRESULT WINAPI knownfolder_GetRedirectionCapabilities( > IKnownFolder *iface, > KF_REDIRECTION_CAPABILITIES *pCapabilities) > { > - FIXME("%p\n", pCapabilities); > - return E_NOTIMPL; > + FIXME("%p - always denied\n", pCapabilities); > + *pCapabilities = KF_REDIRECTION_CAPABILITIES_DENY_ALL; > + return S_OK; > } > > static HRESULT WINAPI knownfolder_GetFolderDefinition( > Do we have an open bug for that? If it's just a matter of returning static data, it's trivial to fix without any hacks.

2 1

RFC: Flushing the test reports
by Francois Gouget 24 Jan '17

24 Jan '17

When a test causes Windows to crash the test output is often lost, even if it was redirected to a file : said file is often either 0-byte long or is missing a huge chunk. This is particularly annoying when the crash happens as part of WineTest as then one has to manually run a bunch of tests to try and find which one caused the issue. And it's not always which test caused the crash as shown by the rasapi32:rasapi case (bug 42185). So I have tested a couple of approaches to better pinpoint which test is causing trouble, and possibly even which chunk of code in that test causes the crash. The first approach is simple: flush the WineTest report to disk between each test (in Unix terms sync). It has little impact on performance and in case of a crash the last 'dll:test start' line would clearly identify the test responsible. diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 50ebf4fd52a..df527734bb8 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -626,6 +626,11 @@ run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms) PROCESS_INFORMATION pi; DWORD wait, status; + /* Flush to disk so we know which test caused Windows to crash if it does */ + if (out_file) + FlushFileBuffers(out_file); + FlushFileBuffers(GetStdHandle( STD_ERROR_HANDLE )); + GetStartupInfoA (&si); si.dwFlags = STARTF_USESTDHANDLES; si.hStdInput = GetStdHandle( STD_INPUT_HANDLE ); (the second flush is so WineTest's output too is flushed to disk in case stdout is redirected to a file though I did not really check that this part works) Another approach is to add these calls in wine/test.h. This narrows the location of the Windows crash down to an ok()/trace() interval, even more narrow if WINETEST_REPORT_SUCCESS is set. However this has quite an impact on performance: * WineTest normally takes about 19 minutes. * With the extra flushing this goes up to 29 minutes. * With no flushing but report success I get 45 minutes. * With both flushing and report success this shoots up to 315+ minutes. The report success cases can be ignored but even in the normal case the extra 10 minutes are probably not acceptable. So I set the flushing code behind a $WINETEST_FLUSH check. So once you've identified that, for instance, rasapi32:rasapi is causing trouble, you can run it on its own with report success and flushing to pinpoint where it goes wrong. Of course on the TestBot you still won't get the report (until the TestBot is changed appropriately), and you'll have to contend with the 2 minutes timeout but even with those options 88% of the tests completed within the time limit on my machine. That approach could be done with the patch below. commit ef211f6480fe84fd7660314c27bcaa5630dd0c16 Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jan 22 02:57:23 2017 +0100 tests: Flush after each message if WINETEST_FLUSH is set. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> diff --git a/include/wine/test.h b/include/wine/test.h index aa89c55ca07..149b0a9ae14 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -52,6 +52,9 @@ extern int winetest_debug; /* running in interactive mode? */ extern int winetest_interactive; +/* flush after each trace */ +extern int winetest_flush; + /* current platform */ extern const char *winetest_platform; @@ -199,6 +202,9 @@ int winetest_debug = 1; /* interactive mode? */ int winetest_interactive = 0; +/* flush to disk after every message? */ +int winetest_flush = 0; + /* current platform */ const char *winetest_platform = "windows"; @@ -291,6 +297,11 @@ int broken( int condition ) { return (strcmp(winetest_platform, "windows") == 0) && condition; } +static void winetest_do_flush( void ) +{ + if (winetest_flush) + FlushFileBuffers(GetStdHandle( STD_ERROR_HANDLE )); +} /* * Checks condition. @@ -313,6 +324,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) printf( "%s:%d: Test succeeded inside todo block: ", data->current_file, data->current_line ); vprintf(msg, args); + winetest_do_flush(); InterlockedIncrement(&todo_failures); return 0; } @@ -323,6 +335,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) printf( "%s:%d: Test marked todo: ", data->current_file, data->current_line ); vprintf(msg, args); + winetest_do_flush(); } InterlockedIncrement(&todo_successes); return 1; @@ -335,14 +348,18 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) printf( "%s:%d: Test failed: ", data->current_file, data->current_line ); vprintf(msg, args); + winetest_do_flush(); InterlockedIncrement(&failures); return 0; } else { if (report_success) + { printf( "%s:%d: Test succeeded\n", data->current_file, data->current_line); + winetest_do_flush(); + } InterlockedIncrement(&successes); return 1; } @@ -369,6 +386,7 @@ void __winetest_cdecl winetest_trace( const char *msg, ... ) __winetest_va_start(valist, msg); vprintf(msg, valist); __winetest_va_end(valist); + winetest_do_flush(); } } @@ -378,6 +396,7 @@ void winetest_vskip( const char *msg, __winetest_va_list args ) printf( "%s:%d: Tests skipped: ", data->current_file, data->current_line ); vprintf(msg, args); + winetest_do_flush(); skipped++; } @@ -443,7 +462,10 @@ void winetest_wait_child_process( HANDLE process ) DWORD exit_code = 1; if (WaitForSingleObject( process, 30000 )) + { printf( "%s: child process wait failed\n", current_test->name ); + winetest_do_flush(); + } else GetExitCodeProcess( process, &exit_code ); @@ -452,12 +474,14 @@ void winetest_wait_child_process( HANDLE process ) if (exit_code > 255) { printf( "%s: exception 0x%08x in child process\n", current_test->name, exit_code ); + winetest_do_flush(); InterlockedIncrement( &failures ); } else { printf( "%s: %u failures in child process\n", current_test->name, exit_code ); + winetest_do_flush(); while (exit_code-- > 0) InterlockedIncrement(&failures); } @@ -599,6 +623,7 @@ static int run_test( const char *name ) todo_successes, failures + todo_failures, (failures + todo_failures != 1) ? "failures" : "failure", skipped ); + winetest_do_flush(); } status = (failures + todo_failures < 255) ? failures + todo_failures : 255; return status; @@ -624,6 +649,7 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) printf( "%s: unhandled exception %08x at %p\n", current_test->name, ptrs->ExceptionRecord->ExceptionCode, ptrs->ExceptionRecord->ExceptionAddress ); fflush( stdout ); + winetest_do_flush(); return EXCEPTION_EXECUTE_HANDLER; } @@ -660,6 +686,7 @@ int main( int argc, char **argv ) if (GetEnvironmentVariableA( "WINETEST_IS_CHILD", p, sizeof(p) )) winetest_is_child = atoi(p); /* Identify any future process as a child of this one */ SetEnvironmentVariableA( "WINETEST_IS_CHILD", "1" ); + if (GetEnvironmentVariableA( "WINETEST_FLUSH", p, sizeof(p) )) winetest_flush = atoi(p); if (!strcmp( winetest_platform, "windows" )) SetUnhandledExceptionFilter( exc_filter ); if (!winetest_interactive) SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX ); Both approaches could be combined. Comments? Suggestions? -- Francois Gouget <fgouget(a)codeweavers.com>

1 0

Re: [PATCH] winegstreamer: Avoid zero division in amt_from_gst_caps_video().
by Andrew Eikum 24 Jan '17

24 Jan '17

Hi Masanori, Thank you for working on this! We're late in code freeze right now, can you please re-submit this patch after Wine 2.0 is released? Also, it would be better to use the MulDiv function to avoid integer overflow: vih->AvgTimePerFrame = (nom == 0) ? 0 : MulDiv(10000000, denom, nom); Andrew On Mon, Jan 23, 2017 at 10:29:19PM +0900, Masanori Kakura wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=42212 > > Signed-off-by: Masanori Kakura <kakurasan(a)gmail.com> > --- > dlls/winegstreamer/gstdemux.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c > index c33ed9e..14ee584 100644 > --- a/dlls/winegstreamer/gstdemux.c > +++ b/dlls/winegstreamer/gstdemux.c > @@ -233,9 +233,7 @@ static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) > bih->biCompression = amt->subtype.Data1; > } > bih->biSizeImage = width * height * bih->biBitCount / 8; > - vih->AvgTimePerFrame = 10000000; > - vih->AvgTimePerFrame *= denom; > - vih->AvgTimePerFrame /= nom; > + vih->AvgTimePerFrame = (nom == 0) ? 0 : 10000000 * denom / nom; > vih->rcSource.left = 0; > vih->rcSource.right = width; > vih->rcSource.top = height; > -- > 2.9.3 > > >

1 0

Re: dinput: Silence some effects feedback in linuxinput
by Andrew Eikum 24 Jan '17

24 Jan '17

Instead of adding new cases, would you be opposed to just changing the FIXME into a TRACE or maybe a WARN? I think that would scale better, and users are likely only interested if they're doing dinput development anyway. Andrew

2 1

Re: [PATCH] Rename Mac OS X to macOS
by Nikolay Sivov 23 Jan '17

23 Jan '17

On 23.01.2017 22:19, André Hentschel wrote: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > en/winedev-multimedia.sgml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/en/winedev-multimedia.sgml b/en/winedev-multimedia.sgml > index fa04b04..4c95349 100644 > --- a/en/winedev-multimedia.sgml > +++ b/en/winedev-multimedia.sgml > @@ -330,7 +330,7 @@ Kernel space | Client applications > </listitem> > <listitem> > <para> > - Core Audio as introduced in Mac OS X 10.3. Source code resides in > + Core Audio as introduced in macOS 10.3. Source code resides in > <filename class="libraryfile">dlls/winecoreaudio.drv</filename>. > </para> > </listitem> > 10.3 was before macOS renaming, so original sounds better to me.

2 1

Re: [PATCH] programs/winhlp32: Use noyywrap for macro.lex.l
by Fabian Maurer 23 Jan '17

23 Jan '17

On Sunday, January 22, 2017 11:00:26 AM CET Mike Swanson wrote: > diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l > index 8f6945ca98..ff8a4832d3 100644 > --- a/programs/winhlp32/macro.lex.l > +++ b/programs/winhlp32/macro.lex.l > @@ -20,7 +20,7 @@ > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, > USA */ > %} > -%option noinput nounput never-interactive 8bit > +%option noinput nounput noyywrap never-interactive 8bit > %x quote > %{ > #include "config.h" > @@ -367,7 +367,3 @@ WINHELP_WINDOW* MACRO_CurrentWindow(void) > { > return lex_data ? lex_data->window : Globals.active_win; > } > - > -#ifndef yywrap > -int yywrap(void) { return 1; } > -#endif > -- > 2.11.0 Hello, I applied the patch and it compiles now, but I get a warning: > macro.lex.yy.c:398:0: warning: "yywrap" redefined > macro.lex.yy.c:74:0: note: this is the location of the previous definition You probably want to get rid of that, too. Regards, Fabian

4 5

Re: [PATCH] ws2_32/tests: Fix memcmp size in test_TransmitFile().
by Bruno Jesus 23 Jan '17

23 Jan '17

On Fri, Jan 20, 2017 at 5:54 PM, Zebediah Figura <z.figura12(a)gmail.com> wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=42221 > > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/ws2_32/tests/sock.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c > index 5856718..3c3e443 100644 > --- a/dlls/ws2_32/tests/sock.c > +++ b/dlls/ws2_32/tests/sock.c > @@ -8304,9 +8304,9 @@ static void test_TransmitFile(void) > iret = recv(dest, buf, sizeof(buf), 0); > ok(iret == sizeof(header_msg)+sizeof(footer_msg)+2, > "Returned an unexpected buffer from TransmitFile: %d\n", iret ); > - ok(memcmp(&buf[0], &header_msg[0], sizeof(header_msg)+1) == 0, > + ok(memcmp(&buf[0], &header_msg[0], sizeof(header_msg)) == 0, > "TransmitFile header buffer did not match!\n"); > - ok(memcmp(&buf[sizeof(header_msg)+1], &footer_msg[0], sizeof(footer_msg)+1) == 0, > + ok(memcmp(&buf[sizeof(header_msg)+1], &footer_msg[0], sizeof(footer_msg)) == 0, > "TransmitFile footer buffer did not match!\n"); Hi, you also have to change the sending lengths because it is also using +1. I believe this was a strlen/sizeof misfortune, right? Best wishes, Bruno

3 4

Re: server: Remove dead check in is_cpu_supported().
by Henri Verbeet 22 Jan '17

22 Jan '17

For what it's worth, On 21 January 2017 at 16:25, Gerald Pfeifer <gerald(a)pfeifer.com> wrote: > I am wondering about the following piece of code in server/thread.c: > > int is_cpu_supported( enum cpu_type cpu ) > { > unsigned int prefix_cpu_mask = get_prefix_cpu_mask(); > > if (CPU_FLAG(cpu) && (supported_cpus & prefix_cpu_mask & CPU_FLAG(cpu))) return 1; > > that was added as part of > > commit 1e78c99388c61d353cf60787eac6415328f54560 > Author: Alexandre Julliard <julliard(a)winehq.org> > Date: Fri Nov 22 12:32:48 2013 +0100 > > kernel32: Validate the architecture of newly created processes on the server side. > It's actually older than that, and seems to have been introduced by commit 279defe66e1265eeae3e2a72126c2b2f75e20c99 Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 3 14:59:12 2009 +0200 server: Verify that the client is using a supported CPU type. > That means CPU_FLAG(...) is always positive and different from zero > -- unless its parameter is 32 or higher on a 32-bit architecture > (and the 1 shifts out). > But the definition of CPU_FLAG doesn't really matter for this. If "CPU_FLAG(cpu)" evaluates to zero, "supported_cpus & prefix_cpu_mask & CPU_FLAG(cpu)" evaluates to zero as well.

2 1

Re: [PATCH] ws2_32/tests: Fix memcmp size in test_TransmitFile().
by Marvin 22 Jan '17

22 Jan '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=27913 Your paranoid android. === w8 (32 bit sock) === sock.c:7995: Test failed: bytesReturned isn't supposed to be 1 sock.c:8019: Test failed: GetOverlappedResult failed, error 0

1 0

TestBot news
by Francois Gouget 21 Jan '17

21 Jan '17

I have upgraded Debian on vm1 from 7 to 8.6 and the filesystem from ext3 to ext4. This gets it a non-antique version of the kernel and QEMU which includes Huw's fix for the ntdll:exception test. So there should be one less unfixable failure for VMs being run on vm1. That said I'm not really happy with the state of things on vm1: for some reason its reverts are much slower than they should be. For instance with the wvista VM doing 3 reverts in a row on otherwise idle machines gives me: vm1 56.361s 46.803s 46.569s vm2 10.206s 9.783s 9.912s vm3 9.583s 8.137s 8.004s One could think that vm2 has much better hardware but that's just not the case: PassMark Disk Disk Host CPU MT ST Type Speed vm1 Xeon E3-1230v2 8855 1940 HD 130 MB/s vm2 Opteron 6128 6959 n/a HD Raid0 144 MB/s vm3 Xeon E3-1226v3 7462 2127 SSD 354 MB/s All hosts have 16 GB of RAM. So vm2 has what looks like a somewhat slower processor and a marginally faster disk thanks to Raid0. That should not be sufficient for it to be 4 times faster, particularly given that vm3 has a disk that's over twice as fast is only marginally faster than vm2. Indeed during the revert vm1 shows no read traffic (lots of RAM to cache that), but a steady 6 MB/s stream of writes ! In contrast on vm2 writes quickly ramp up to 80 MB/s, then stop after ~5 seconds and QEMU just uses CPU for the last ~4 seconds. vm3 also shows it's not an AMD vs Intel thing. There may be some missing CPU feature on vm1 but if that's the case I don't see what. So there is still a mystery there and if anyone has an insight into it it would be appreciated. Despite that I have put vm1 back to active duty. But I decided to keep the wvistau64 VM on the vm2 host. This means vm1 essentially only has one VM to take care of and since most of the time it's going to be idle already it should not slow jobs down. I also applied all Windows updates up to 2016/07/25 to the w7u VM. This caused some new failures that Hans started tackling / fixed. Any other new failure on the 3 VMs affected by the upgrade (wvista, wvistau64 and w7u) should be fixable. The configuration of the other two vms, wvista and wvistau64 should be essentially unchanged. Finally I also performed a minor upgrade on vm3: from Debian 8.2 to 8.6. The goal was to see if the minor QEMU upgrade would be sufficient to get Windows 10 to stop crashing when running WineTest. It looks like that's not the case. So the next step will be to grab QEMU 2.7 from the Debian BackPorts but there's a dumb command line incompatibility with libvirt 1.2.9 and there's no easily installable alternative :-( Fortunately I have a qemu wrapper script that should bridge the gap. -- Francois Gouget <fgouget(a)codeweavers.com>

4 9

authz.dll
by André Hentschel 21 Jan '17

21 Jan '17

Hi, while looking through the output of my wip script for detecting wrong spec file entries I came across authz.dll And here we have two suspicious functions: AuthzInitializeContextFromSid and AuthzInitializeContextFromToken Both have a parameter of type "LUID" (a struct, not a pointer) which is defined as: typedef struct _LUID { DWORD LowPart; LONG HighPart; } LUID, *PLUID; The spec-file says this is a long: @ stdcall AuthzInitializeContextFromSid(long ptr long ptr long ptr ptr) @ stdcall AuthzInitializeContextFromToken(long long long ptr long ptr ptr) I think a struct like this deserves two longs ("long long") in the spec file, right?

1 0

Wine and Valgrind / handling SIGILL
by Austin English 20 Jan '17

20 Jan '17

Howdy all, Several months ago, a patch from Sebastian: commit 44fbc018eda12bdee5c2c1e2e40dbdc6a81b27fd Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 12 11:09:34 2015 +0100 winebuild: Do not access memory below ESP when restoring thread contexts. Based on a patch by John Reiser. for https://bugs.winehq.org/show_bug.cgi?id=14367 Caused problems for running Wine under Valgrind: https://bugs.kde.org/show_bug.cgi?id=344139 There are patches floating around for both Wine and Valgrind (see previous link), but from what I've seen so far, both projects aren't a fan of the current patches. Given that Wine developers like using Valgrind to check for problems, and I know Julian would like to use Wine with Valgrind, I feel like some solution to this problem can be found. Since my efforts at trying to run messages between the two projects hasn't solved it yet, I figured an email thread would work better ;). -- -Austin GPG: 14FB D7EA A041 937B

3 7

Wine-2.0-rc5 source code (Cppcheck 1.72)
by Игорь Чебаненко 20 Jan '17

20 Jan '17

Wine source code scanning with Cppcheck.

1 0

Re: [PATCH 5/5] wined3d: Recognize another Radeon HD 4650 PCI device id.
by Henri Verbeet 19 Jan '17

19 Jan '17

On 18 January 2017 at 21:35, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > For bug 34671, with thanks to winetaste(a)gmx.net for the relevant info. > This still doesn't make sense to me. In what cases does this make a difference? Which of those do we care about? > @@ -2018,8 +2019,8 @@ cards_amd_binary[] = > - {"HD 4670", CARD_AMD_RADEON_HD4600}, /* Radeon RV730 */ > - {"HD 4650", CARD_AMD_RADEON_HD4600}, /* Radeon RV730 */ > + {"HD 4670", CARD_AMD_RADEON_HD4650}, /* Radeon RV730 */ > + {"HD 4650", CARD_AMD_RADEON_HD4650}, /* Radeon RV730 */ This is arbitrary.

2 2

Re: [PATCH] setupapi: Stub CM_Open_DevNode_Key and CM_Get_Child
by Nikolay Sivov 19 Jan '17

19 Jan '17

On 18.01.2017 22:40, Christoph Brill wrote: > Both are necessary to start Lord of the Rings Online as of January 2017 > > Signed-off-by: Christoph Brill <egore911(a)gmail.com> > --- > dlls/setupapi/setupapi.spec | 4 ++-- > dlls/setupapi/stubs.c | 22 ++++++++++++++++++++++ > 2 files changed, 24 insertions(+), 2 deletions(-) > > diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec > index 0eb8359ee1..5c57c23431 100644 > --- a/dlls/setupapi/setupapi.spec > +++ b/dlls/setupapi/setupapi.spec > @@ -53,7 +53,7 @@ > @ stub CM_Free_Res_Des > @ stub CM_Free_Res_Des_Ex > @ stub CM_Free_Res_Des_Handle > -@ stub CM_Get_Child > +@ stdcall CM_Get_Child(ptr long long) > @ stub CM_Get_Child_Ex > @ stub CM_Get_Class_Key_NameA > @ stub CM_Get_Class_Key_NameW > @@ -144,7 +144,7 @@ > @ stub CM_Open_Class_KeyW > @ stub CM_Open_Class_Key_ExA > @ stub CM_Open_Class_Key_ExW > -@ stub CM_Open_DevNode_Key > +@ stdcall CM_Open_DevNode_Key(long long long long ptr long) > @ stub CM_Open_DevNode_Key_Ex > @ stub CM_Query_And_Remove_SubTreeA > @ stub CM_Query_And_Remove_SubTreeW > diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c > index 6ecf240c86..1f76b08a3d 100644 > --- a/dlls/setupapi/stubs.c > +++ b/dlls/setupapi/stubs.c > @@ -79,6 +79,28 @@ CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE handle) > } > > /*********************************************************************** > + * CM_Open_DevNode_Key (SETUPAPI.@) > + */ > +CONFIGRET WINAPI CM_Open_DevNode_Key( > + DEVINST dnDevInst, REGSAM access, ULONG ulHardwareProfile, ULONG /*REGDISPOSITION*/ disposition, > + PHKEY phkDevice, ULONG ulFlags) > +{ > + FIXME("0x%08x 0x%08x 0x%08x 0x%08x %p 0x%08x : stub\n", dnDevInst, access, ulHardwareProfile, > + disposition, phkDevice, ulFlags); > + return CR_SUCCESS; > +} > + > +/*********************************************************************** > + * CM_Get_Child (SETUPAPI.@) > + */ > +CONFIGRET WINAPI CM_Get_Child( > + PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags) > +{ > + FIXME("%p 0x%08x 0x%08x: stub\n", pdnDevInst, dnDevInst, ulFlags); > + return CR_SUCCESS; > +} > + Hi, Christoph. Please add prototypes to corresponding public header too. This will also fix REGDISPOSITION case - no reason not to have proper typedef for it. Also please run ./tools/make_specfiles to update dependent dlls.

1 0

Re: iphlpapi/tests: Add test for AllocateAndGetTcpExTableFromStack
by Sebastian Lackner 18 Jan '17

18 Jan '17

On 16.01.2017 17:55, André Hentschel wrote: > + ok( ret == ERROR_INVALID_PARAMETER || broken(ERROR_NOT_SUPPORTED) /* win2k */, "got %u\n", ret ); That is not how broken() works.

1 0

Re: regedit: Select a treeitem on right mouse click
by Nikolay Sivov 18 Jan '17

18 Jan '17

On 17.01.2017 12:47, Hugh McMaster wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=14606 > > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > programs/regedit/childwnd.c | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c > index 08eeec1..c9a35be 100644 > --- a/programs/regedit/childwnd.c > +++ b/programs/regedit/childwnd.c > @@ -411,8 +411,19 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa > g_pChildWnd->nFocusPanel = 0; > break; > case NM_RCLICK: { > - POINT pt; > + POINT pt, client_pt; > + TVHITTESTINFO ht; > + HTREEITEM treeitem; > + HWND hTree = ((NMHDR *)lParam)->hwndFrom; > + > GetCursorPos(&pt); > + client_pt = pt; > + ScreenToClient(hWnd, &client_pt); > + ht.pt = client_pt; > + treeitem = (HTREEITEM)SendMessageA(hTree, TVM_HITTEST, 0, (LPARAM)&ht); > + if (!treeitem) return 1; > + SendMessageW(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)treeitem); > + > TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), > TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL); > break; > This looks like a workaround, according to https://bugs.winehq.org/show_bug.cgi?id=14606 you should be able to TVM_GETNEXTITEM with TVGN_CARET, as selection should happen automatically.

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