December 2015 - Wine-Commits

Nikolay Sivov : ole32/tests: Some tests for CoGetMalloc().
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

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

Austin English : wine.inf: Add HKCR\folder\shellex\ContextMenuHandlers and HKCR\*\shellex\ContextMenuHandlers keys.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

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

Austin English : wine.inf: Add " HKLM\System\CurrentControlSet\Services\Eventlog\System" key.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

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

Sebastian Lackner : user32/tests: Add test to check ObjectNameInformation for desktop objects.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

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 Dec. 4, 2015

Dec. 4, 2015

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

Piotr Caban : msiexec: Avoid broken pipe error caused by setting SERVICE_STOPPED state twice.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 0722a25dcd085a6f981bbc5651a169a4045baf38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0722a25dcd085a6f981bbc565… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 11:41:43 2015 +0100 msiexec: Avoid broken pipe error caused by setting SERVICE_STOPPED state twice. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msiexec/service.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/programs/msiexec/service.c b/programs/msiexec/service.c index 59dfd0e..735cd5c 100644 --- a/programs/msiexec/service.c +++ b/programs/msiexec/service.c @@ -47,7 +47,9 @@ static BOOL UpdateSCMStatus(DWORD dwCurrentState, DWORD dwWin32ExitCode, status.dwServiceType = SERVICE_WIN32_OWN_PROCESS; status.dwCurrentState = dwCurrentState; - if (dwCurrentState == SERVICE_START_PENDING) + if (dwCurrentState == SERVICE_START_PENDING + || dwCurrentState == SERVICE_STOP_PENDING + || dwCurrentState == SERVICE_STOPPED) status.dwControlsAccepted = 0; else { @@ -81,8 +83,6 @@ static BOOL UpdateSCMStatus(DWORD dwCurrentState, DWORD dwWin32ExitCode, static void WINAPI ServiceCtrlHandler(DWORD code) { - DWORD state = SERVICE_RUNNING; - WINE_TRACE("%d\n", code); switch (code) @@ -91,14 +91,12 @@ static void WINAPI ServiceCtrlHandler(DWORD code) case SERVICE_CONTROL_STOP: UpdateSCMStatus(SERVICE_STOP_PENDING, NO_ERROR, 0); KillService(); - state = SERVICE_STOPPED; break; default: fprintf(stderr, "Unhandled service control code: %d\n", code); + UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0); break; } - - UpdateSCMStatus(state, NO_ERROR, 0); } static DWORD WINAPI ServiceExecutionThread(LPVOID param) @@ -150,10 +148,7 @@ static void WINAPI ServiceMain(DWORD argc, LPSTR *argv) } UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0); - - WaitForSingleObject(kill_event, INFINITE); - KillService(); - + WaitForSingleObject(thread, INFINITE); UpdateSCMStatus(SERVICE_STOPPED, NO_ERROR, 0); }

1 0

Alexandre Julliard : tools: Allow running installed builtin apps even when the 32-bit loader is missing.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 57f9c33c08782399d6729bc58b68d73812560638 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57f9c33c08782399d6729bc58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 18:10:35 2015 +0900 tools: Allow running installed builtin apps even when the 32-bit loader is missing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wineapploader.in | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/tools/wineapploader.in b/tools/wineapploader.in index 03ede5e..f48d552 100755 --- a/tools/wineapploader.in +++ b/tools/wineapploader.in @@ -25,9 +25,6 @@ appname=`basename "$0" .exe`.exe # first try explicit WINELOADER if [ -x "$WINELOADER" ]; then exec "$WINELOADER" "$appname" "$@"; fi -# then default bin directory -if [ -x "@bindir@/wine" ]; then exec "@bindir@/wine" "$appname" "$@"; fi - # now try the directory containing $0 appdir="" case "$0" in @@ -47,6 +44,21 @@ case "$0" in ;; esac if [ -x "$appdir/wine" ]; then exec "$appdir/wine" "$appname" "$@"; fi +if [ -x "$appdir/wine64" ]; then exec "$appdir/wine64" "$appname" "$@"; fi + +# now look in PATH +saved_ifs=$IFS +IFS=: +for d in $PATH +do + IFS=$saved_ifs + if [ -x "$d/wine" ]; then exec "$d/wine" "$appname" "$@"; fi + if [ -x "$d/wine64" ]; then exec "$d/wine64" "$appname" "$@"; fi +done + +# finally, the default bin directory +if [ -x "@bindir@/wine" ]; then exec "@bindir@/wine" "$appname" "$@"; fi +if [ -x "@bindir@/wine64" ]; then exec "@bindir@/wine64" "$appname" "$@"; fi -# finally look in PATH -exec wine "$appname" "$@" +echo "$0: the Wine loader is missing" +exit 1

1 0

Henri Verbeet : ddraw: Return DDERR_NOEXCLUSIVEMODE in ddraw_surface7_Flip () when not in exclusive mode.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 83f10e2251e7ab07e48b076aa8d0bb7dc68474a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83f10e2251e7ab07e48b076aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 4 11:30:13 2015 +0100 ddraw: Return DDERR_NOEXCLUSIVEMODE in ddraw_surface7_Flip() when not in exclusive mode. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 45c7594..f8acb2d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1239,6 +1239,13 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_mutex_lock(); + if (!(dst_impl->ddraw->cooperative_level & DDSCL_EXCLUSIVE)) + { + WARN("Not in exclusive mode.\n"); + wined3d_mutex_unlock(); + return DDERR_NOEXCLUSIVEMODE; + } + tmp_rtv = ddraw_surface_get_rendertarget_view(dst_impl); tmp = dst_impl->wined3d_surface; texture = dst_impl->wined3d_texture;

1 0

Dmitry Timoshkov : winhttp/tests: Add a test for data returned by IWinHttpRequest::get_ResponseText() using an https connection.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 7dc055f89704c8d789c3719a25f332e4c4a2c1fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dc055f89704c8d789c3719a2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 4 17:15:46 2015 +0800 winhttp/tests: Add a test for data returned by IWinHttpRequest::get_ResponseText() using an https connection. 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 | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index bc36fa2..2b460df 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -38,6 +38,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static const WCHAR test_useragent[] = {'W','i','n','e',' ','R','e','g','r','e','s','s','i','o','n',' ','T','e','s','t',0}; static const WCHAR test_winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; +static const WCHAR test_winehq_https[] = {'h','t','t','p','s',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',':','4','4','3',0}; static const WCHAR localhostW[] = {'l','o','c','a','l','h','o','s','t',0}; static BOOL proxy_active(void) @@ -3560,6 +3561,31 @@ static void test_IWinHttpRequest(void) SysFreeString( today ); VariantClear( &proxy_server ); VariantClear( &bypass_list ); + + hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); + ok( hr == S_OK, "got %08x\n", hr ); + + url = SysAllocString( test_winehq_https ); + method = SysAllocString( method3W ); + V_VT( &async ) = VT_BOOL; + V_BOOL( &async ) = VARIANT_FALSE; + hr = IWinHttpRequest_Open( req, method, url, async ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( method ); + SysFreeString( url ); + + V_VT( &data ) = VT_BSTR; + V_BSTR( &data ) = NULL; + hr = IWinHttpRequest_Send( req, data ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IWinHttpRequest_get_ResponseText( req, &response ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", wine_dbgstr_wn(response, 32) ); + SysFreeString( response ); + + IWinHttpRequest_Release( req ); + CoUninitialize(); }

1 0

Dmitry Timoshkov : winhttp/tests: Accept Windows7 return value for WinHttpQueryOption( WINHTTP_OPTION_CONNECTION_INFO).
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

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