December 2015 - Wine-commits

Alexandre Julliard : Wine release 1.8-rc3
by Alexandre Julliard 04 Dec '15

04 Dec '15

Module: website Branch: master Commit: 69a8bb0b6c9de8be1b48b4a80bd06f0e2763d623 URL: http://source.winehq.org/git/website.git/?a=commit;h=69a8bb0b6c9de8be1b48b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 23:19:36 2015 +0900 Wine release 1.8-rc3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2015120401.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2015120401.xml b/news/en/2015120401.xml new file mode 100644 index 0000000..426f4a3 --- /dev/null +++ b/news/en/2015120401.xml @@ -0,0 +1,12 @@ +<news> +<date>December 4, 2015</date> +<title>Wine 1.8-rc3 Released</title> +<body> + The Wine development release 1.8-rc3 is now available. + <a href="{$root}/announce/1.8-rc3">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.8/wine-1.8-rc3.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Sebastian Lackner : user32/tests: Add test to check ObjectNameInformation for desktop objects.
by Alexandre Julliard 04 Dec '15

04 Dec '15

Module: wine Branch: master Commit: 8c4a785daf4b833561054e3556e094ab2ba6bf92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c4a785daf4b833561054e355… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 4 01:18:51 2015 +0100 user32/tests: Add test to check ObjectNameInformation for desktop objects. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/winstation.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 30c56c3..db82026 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -23,6 +23,9 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" +#include "winternl.h" + +static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG, PULONG); #define DESKTOP_ALL_ACCESS 0x01ff @@ -388,12 +391,14 @@ static void test_enumdesktops(void) static void test_getuserobjectinformation(void) { - HDESK desk; - WCHAR bufferW[20]; - char buffer[20]; - WCHAR foobarTestW[] = {'f','o','o','b','a','r','T','e','s','t',0}; + WCHAR foobarTestW[] = {'\\','f','o','o','b','a','r','T','e','s','t',0}; WCHAR DesktopW[] = {'D','e','s','k','t','o','p',0}; + OBJECT_NAME_INFORMATION *name_info; + WCHAR bufferW[20]; + char buffer[64]; + NTSTATUS status; DWORD size; + HDESK desk; BOOL ret; desk = CreateDesktopA("foobarTest", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL); @@ -440,9 +445,16 @@ static void test_getuserobjectinformation(void) ok(ret, "GetUserObjectInformationW returned %x\n", ret); ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); - ok(lstrcmpW(bufferW, foobarTestW) == 0, "Buffer is not set to 'foobarTest'\n"); + ok(lstrcmpW(bufferW, foobarTestW + 1) == 0, "Buffer is not set to 'foobarTest'\n"); ok(size == 22, "size is set to %d\n", size); /* 22 bytes in 'foobarTest\0' in Unicode */ + /* ObjectNameInformation does not return the full desktop name */ + name_info = (OBJECT_NAME_INFORMATION *)buffer; + status = pNtQueryObject(desk, ObjectNameInformation, name_info, sizeof(buffer), NULL); + ok(!status, "expected STATUS_SUCCESS, got %08x\n", status); + todo_wine ok(lstrcmpW(name_info->Name.Buffer, foobarTestW) == 0, + "expected '\\foobarTest', got %s\n", wine_dbgstr_w(name_info->Name.Buffer)); + /** Tests for UOI_TYPE **/ /* Get size, test size and return value/error code */ @@ -935,6 +947,9 @@ static void test_foregroundwindow(void) START_TEST(winstation) { + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + pNtQueryObject = (void *)GetProcAddress(hntdll, "NtQueryObject"); + /* Check whether this platform supports WindowStation calls */ SetLastError( 0xdeadbeef );

1 0

Sebastian Lackner : user32: Make sure explorer.exe process is spawned for the correct desktop.
by Alexandre Julliard 04 Dec '15

04 Dec '15

Module: wine Branch: master Commit: 19a3f6b5cb956bc4af1455bd624828478e2c0444 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19a3f6b5cb956bc4af1455bd6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 4 01:19:58 2015 +0100 user32: Make sure explorer.exe process is spawned for the correct desktop. If an invalid combination of winstation/desktop is active for the current process, the handle inheritance doesn't work, and no desktop is created. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 19 +++++++++++++++++++ dlls/user32/winstation.c | 2 +- include/wine/server_protocol.h | 5 +++-- server/protocol.def | 5 +++-- server/winstation.c | 15 ++++++++------- 5 files changed, 34 insertions(+), 12 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 360834e..1a3cd49 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -25,6 +25,7 @@ #include <stdarg.h> #include <stdlib.h> #include <string.h> + #include "windef.h" #include "winbase.h" #include "winver.h" @@ -2040,10 +2041,28 @@ HWND WINAPI GetDesktopWindow(void) WCHAR windir[MAX_PATH]; WCHAR app[MAX_PATH + sizeof(explorer)/sizeof(WCHAR)]; WCHAR cmdline[MAX_PATH + (sizeof(explorer) + sizeof(args))/sizeof(WCHAR)]; + WCHAR desktop[MAX_PATH]; void *redir; + SERVER_START_REQ( set_user_object_info ) + { + req->handle = wine_server_obj_handle( GetThreadDesktop(GetCurrentThreadId()) ); + req->flags = SET_USER_OBJECT_GET_FULL_NAME; + wine_server_set_reply( req, desktop, sizeof(desktop) - sizeof(WCHAR) ); + if (!wine_server_call( req )) + { + size_t size = wine_server_reply_size( reply ); + desktop[size / sizeof(WCHAR)] = 0; + TRACE( "starting explorer for desktop %s\n", debugstr_w(desktop) ); + } + else + desktop[0] = 0; + } + SERVER_END_REQ; + memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); + si.lpDesktop = *desktop ? desktop : NULL; si.dwFlags = STARTF_USESTDHANDLES; si.hStdInput = 0; si.hStdOutput = 0; diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index d1353b4..ae1d6ad 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -632,7 +632,7 @@ BOOL WINAPI SetUserObjectInformationW( HANDLE handle, INT index, LPVOID info, DW SERVER_START_REQ( set_user_object_info ) { req->handle = wine_server_obj_handle( handle ); - req->flags = SET_USER_OBJECT_FLAGS; + req->flags = SET_USER_OBJECT_SET_FLAGS; req->obj_flags = obj_flags->dwFlags; ret = !wine_server_call_err( req ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 64f02a0..4e33260 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4009,7 +4009,8 @@ struct set_user_object_info_reply unsigned int old_obj_flags; /* VARARG(name,unicode_str); */ }; -#define SET_USER_OBJECT_FLAGS 1 +#define SET_USER_OBJECT_SET_FLAGS 1 +#define SET_USER_OBJECT_GET_FULL_NAME 2 @@ -6152,6 +6153,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 489 +#define SERVER_PROTOCOL_VERSION 490 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index aa37c66..04814c9 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2840,14 +2840,15 @@ enum coords_relative /* Get/set information about a user object (window station or desktop) */ @REQ(set_user_object_info) obj_handle_t handle; /* handle to the object */ - unsigned int flags; /* information to set */ + unsigned int flags; /* information to set/get */ unsigned int obj_flags; /* new object flags */ @REPLY int is_desktop; /* is object a desktop? */ unsigned int old_obj_flags; /* old object flags */ VARARG(name,unicode_str); /* object name */ @END -#define SET_USER_OBJECT_FLAGS 1 +#define SET_USER_OBJECT_SET_FLAGS 1 +#define SET_USER_OBJECT_GET_FULL_NAME 2 /* Register a hotkey */ diff --git a/server/winstation.c b/server/winstation.c index 08389bb..5016184 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -424,13 +424,13 @@ void close_thread_desktop( struct thread *thread ) } /* set the reply data from the object name */ -static void set_reply_data_obj_name( struct object *obj ) +static void set_reply_data_obj_name( struct object *obj, int full_name ) { data_size_t len; const WCHAR *ptr, *name = get_object_name( obj, &len ); /* if there is a backslash return the part of the name after it */ - if (name && (ptr = memchrW( name, '\\', len/sizeof(WCHAR) ))) + if (name && !full_name && (ptr = memchrW( name, '\\', len/sizeof(WCHAR) ))) { len -= (ptr + 1 - name) * sizeof(WCHAR); name = ptr + 1; @@ -657,14 +657,14 @@ DECL_HANDLER(set_user_object_info) struct desktop *desktop = (struct desktop *)obj; reply->is_desktop = 1; reply->old_obj_flags = desktop->flags; - if (req->flags & SET_USER_OBJECT_FLAGS) desktop->flags = req->obj_flags; + if (req->flags & SET_USER_OBJECT_SET_FLAGS) desktop->flags = req->obj_flags; } else if (obj->ops == &winstation_ops) { struct winstation *winstation = (struct winstation *)obj; reply->is_desktop = 0; reply->old_obj_flags = winstation->flags; - if (req->flags & SET_USER_OBJECT_FLAGS) winstation->flags = req->obj_flags; + if (req->flags & SET_USER_OBJECT_SET_FLAGS) winstation->flags = req->obj_flags; } else { @@ -672,7 +672,8 @@ DECL_HANDLER(set_user_object_info) release_object( obj ); return; } - if (get_reply_max_size()) set_reply_data_obj_name( obj ); + if (get_reply_max_size()) + set_reply_data_obj_name( obj, (req->flags & SET_USER_OBJECT_GET_FULL_NAME) != 0 ); release_object( obj ); } @@ -688,7 +689,7 @@ DECL_HANDLER(enum_winstation) unsigned int access = WINSTA_ENUMERATE; if (req->index > index++) continue; if (!check_object_access( &winsta->obj, &access )) continue; - set_reply_data_obj_name( &winsta->obj ); + set_reply_data_obj_name( &winsta->obj, 0 ); clear_error(); reply->next = index; return; @@ -714,7 +715,7 @@ DECL_HANDLER(enum_desktop) if (req->index > index++) continue; if (!desktop->obj.name) continue; if (!check_object_access( &desktop->obj, &access )) continue; - set_reply_data_obj_name( &desktop->obj ); + set_reply_data_obj_name( &desktop->obj, 0 ); release_object( winstation ); clear_error(); reply->next = index;

1 0

Sebastian Lackner : wineboot: Remove unused declaration for __wine_make_process_system.
by Alexandre Julliard 04 Dec '15

04 Dec '15

Module: wine Branch: master Commit: d38b334babdb536da85b59b5f1fc5525a338b0e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d38b334babdb536da85b59b5f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 4 01:28:04 2015 +0100 wineboot: Remove unused declaration for __wine_make_process_system. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 1477287..ee5b8d4 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -1152,7 +1152,6 @@ static const struct option long_options[] = int main( int argc, char *argv[] ) { - extern HANDLE CDECL __wine_make_process_system(void); static const WCHAR RunW[] = {'R','u','n',0}; static const WCHAR RunOnceW[] = {'R','u','n','O','n','c','e',0}; static const WCHAR RunServicesW[] = {'R','u','n','S','e','r','v','i','c','e','s',0};

1 0

Austin English : wine.inf: Add " HKLM\System\CurrentControlSet\Services\Eventlog\System" key.
by Alexandre Julliard 04 Dec '15

04 Dec '15

Module: wine Branch: master Commit: 8ba649563c84015a967e36d38e969ba39803044e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ba649563c84015a967e36d38… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Dec 3 14:04:09 2015 -0600 wine.inf: Add "HKLM\System\CurrentControlSet\Services\Eventlog\System" key. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 58a8d1d..b0844c3 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3252,6 +3252,7 @@ HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"Schedule" [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 +HKLM,"System\CurrentControlSet\Services\Eventlog\System",,16 HKLM,"System\CurrentControlSet\Services\RpcSs",,16 HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16 HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16

1 0

Austin English : wine.inf: Add HKCR\folder\shellex\ContextMenuHandlers and HKCR\*\shellex\ContextMenuHandlers keys.
by Alexandre Julliard 04 Dec '15

04 Dec '15

Module: wine Branch: master Commit: c23b6f5a9f1fbe9bb6b2422a793c9b0f4d998240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c23b6f5a9f1fbe9bb6b2422a7… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Dec 3 22:48:41 2015 -0500 wine.inf: Add HKCR\folder\shellex\ContextMenuHandlers and HKCR\*\shellex\ContextMenuHandlers keys. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index b0844c3..7c0ad09 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -175,6 +175,7 @@ HKCR,.msi,,2,"Msi.Package" HKCR,.msp,,2,"Msi.Patch" HKCR,.rtf,,2,"rtffile" HKCR,.wri,,2,"wrifile" +HKCR,*\shellex\ContextMenuHandlers,,16 HKCR,chm.file,,2,"Compiled HTML Help File" HKCR,chm.file\DefaultIcon,,2,"%10%\hh.exe,0" HKCR,chm.file\shell\open\command,,2,"%10%\hh.exe %1" @@ -188,6 +189,7 @@ HKCR,exefile\shell\open\command,,2,"""%1"" %*" HKCR,folder\shell\open\ddeexec,,2,"[ViewFolder("%l", %I, %S)]" HKCR,folder\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,folder\shell\open\ddeexec\application,,2,"Folders" +HKCR,folder\shellex\ContextMenuHandlers,,16 HKCR,hlpfile,,2,"Help File" HKCR,hlpfile\shell\open\command,,2,"%11%\winhlp32.exe %1" HKCR,htmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome"

1 0

Nikolay Sivov : ole32/tests: Some tests for CoGetMalloc().
by Alexandre Julliard 04 Dec '15

04 Dec '15

Module: wine Branch: master Commit: f797f63d24f7d4e2be74814b7fc799eefbdf0461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f797f63d24f7d4e2be74814b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 4 12:19:26 2015 +0300 ole32/tests: Some tests for CoGetMalloc(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b03e861..10eb2fa 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2619,6 +2619,51 @@ static void test_CoWaitForMultipleHandles(void) CoUninitialize(); } +static void test_CoGetMalloc(void) +{ + IMalloc *imalloc; + HRESULT hr; + +if (0) /* crashes on native */ + hr = CoGetMalloc(0, NULL); + + imalloc = (void*)0xdeadbeef; + hr = CoGetMalloc(0, &imalloc); +todo_wine { + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(imalloc == NULL, "got %p\n", imalloc); +} + imalloc = (void*)0xdeadbeef; + hr = CoGetMalloc(MEMCTX_SHARED, &imalloc); +todo_wine { + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(imalloc == NULL, "got %p\n", imalloc); +} + imalloc = (void*)0xdeadbeef; + hr = CoGetMalloc(MEMCTX_MACSYSTEM, &imalloc); +todo_wine { + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(imalloc == NULL, "got %p\n", imalloc); +} + imalloc = (void*)0xdeadbeef; + hr = CoGetMalloc(MEMCTX_UNKNOWN, &imalloc); +todo_wine { + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(imalloc == NULL, "got %p\n", imalloc); +} + imalloc = (void*)0xdeadbeef; + hr = CoGetMalloc(MEMCTX_SAME, &imalloc); +todo_wine { + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(imalloc == NULL, "got %p\n", imalloc); +} + imalloc = NULL; + hr = CoGetMalloc(MEMCTX_TASK, &imalloc); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(imalloc != NULL, "got %p\n", imalloc); + IMalloc_Release(imalloc); +} + static void init_funcs(void) { HMODULE hOle32 = GetModuleHandleA("ole32"); @@ -2681,4 +2726,5 @@ START_TEST(compobj) test_OleRegGetMiscStatus(); test_CoCreateGuid(); test_CoWaitForMultipleHandles(); + test_CoGetMalloc(); }

1 0

Nikolay Sivov : browseui: Use defined context kind constant with CoGetMalloc().
by Alexandre Julliard 04 Dec '15

04 Dec '15

Module: wine Branch: master Commit: 3e7da62ab85f2151906f1540510d38d4dbffdb84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e7da62ab85f2151906f15405… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 4 12:23:22 2015 +0300 browseui: Use defined context kind constant with CoGetMalloc(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/browseui/progressdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 70c78c9..24183bd 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -93,7 +93,7 @@ static void set_buffer(LPWSTR *buffer, LPCWSTR string) if (string == NULL) string = empty_string; - CoGetMalloc(1, &malloc); + CoGetMalloc(MEMCTX_TASK, &malloc); cb = (strlenW(string) + 1)*sizeof(WCHAR); if (*buffer == NULL || cb > IMalloc_GetSize(malloc, *buffer))

1 0

Dmitry Timoshkov : winhttp/tests: Accept Windows7 return value for WinHttpQueryOption( WINHTTP_OPTION_CONNECTION_INFO).
by Alexandre Julliard 04 Dec '15

04 Dec '15

Module: wine Branch: master Commit: 42d42daa2e9699869fe553643d8811192fcdb940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42d42daa2e9699869fe553643… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 4 17:14:05 2015 +0800 winhttp/tests: Accept Windows7 return value for WinHttpQueryOption(WINHTTP_OPTION_CONNECTION_INFO). Windows7 doesn't include the size of info.cbSize field in the returned 'size' value. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index bd6b47f..d6b4649 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2903,7 +2903,7 @@ static void test_connection_info( int port ) memset( &info, 0, sizeof(info) ); ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size ); ok( ret, "failed to retrieve connection info %u\n", GetLastError() ); - ok( info.cbSize == sizeof(info), "wrong size %u\n", info.cbSize ); + ok( info.cbSize == sizeof(info) || info.cbSize == sizeof(info) - sizeof(info.cbSize) /* Win7 */, "wrong size %u\n", info.cbSize ); ret = WinHttpReceiveResponse( req, NULL ); ok( ret, "failed to receive response %u\n", GetLastError() ); @@ -2912,7 +2912,7 @@ static void test_connection_info( int port ) memset( &info, 0, sizeof(info) ); ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size ); ok( ret, "failed to retrieve connection info %u\n", GetLastError() ); - ok( info.cbSize == sizeof(info), "wrong size %u\n", info.cbSize ); + ok( info.cbSize == sizeof(info) || info.cbSize == sizeof(info) - sizeof(info.cbSize) /* Win7 */, "wrong size %u\n", info.cbSize ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con );

1 0

Dmitry Timoshkov : winhttp/tests: For a secure connection check what WinHttpQueryDataAvailable() returns as well as first chunk of actual data.
by Alexandre Julliard 04 Dec '15

04 Dec '15

Module: wine Branch: master Commit: 4b1eae9facbd028291cdc1ff77743e5732d2826a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b1eae9facbd028291cdc1ff7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 4 17:14:38 2015 +0800 winhttp/tests: For a secure connection check what WinHttpQueryDataAvailable() returns as well as first chunk of actual data. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index d6b4649..1dbfe08 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -970,8 +970,9 @@ static void CALLBACK cert_error(HINTERNET handle, DWORD_PTR ctx, DWORD status, L static void test_secure_connection(void) { + static const char data_start[] = "<!DOCTYPE html PUBLIC"; HINTERNET ses, con, req; - DWORD size, status, policy, bitness, read_size, err; + DWORD size, status, policy, bitness, read_size, err, available_size; BOOL ret; CERT_CONTEXT *cert; WINHTTP_CERTIFICATE_INFO info; @@ -1050,6 +1051,11 @@ static void test_secure_connection(void) ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); + available_size = 0; + ret = WinHttpQueryDataAvailable(req, &available_size); + ok(ret, "failed to query available data %u\n", GetLastError()); + ok(available_size > 2014, "available_size = %u\n", available_size); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); @@ -1068,8 +1074,11 @@ static void test_secure_connection(void) ok(ret == TRUE, "WinHttpReadData failed: %u.\n", GetLastError()); if (!size) break; read_size += size; + + if (read_size <= 32) + ok(!memcmp(buffer, data_start, sizeof(data_start)-1), "not expected: %.32s\n", buffer); } - ok(read_size > 2014, "read_size = %u\n", read_size); + ok(read_size >= available_size, "read_size = %u, available_size = %u\n", read_size, available_size); cleanup: WinHttpCloseHandle(req);

1 0