February 2017 - Wine-devel - list.winehq.org

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