- wine-devel - winehq.org

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

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