December 2015 - Wine-commits

Dmitry Timoshkov : winhttp/tests: Add a test for data returned by IWinHttpRequest::get_ResponseText().
by Alexandre Julliard 04 Dec '15

04 Dec '15

Module: wine Branch: master Commit: 34e88a4a7661e93f2420a82c493548ec7d6ea2de URL: http://source.winehq.org/git/wine.git/?a=commit;h=34e88a4a7661e93f2420a82c4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 4 17:15:11 2015 +0800 winhttp/tests: Add a test for data returned by IWinHttpRequest::get_ResponseText(). 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 1dbfe08..bc36fa2 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3051,6 +3051,7 @@ static void test_credentials(void) static void test_IWinHttpRequest(void) { + static const WCHAR data_start[] = {'<','!','D','O','C','T','Y','P','E',' ','h','t','m','l',' ','P','U','B','L','I','C'}; static const WCHAR usernameW[] = {'u','s','e','r','n','a','m','e',0}; static const WCHAR passwordW[] = {'p','a','s','s','w','o','r','d',0}; static const WCHAR url1W[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; @@ -3358,6 +3359,7 @@ static void test_IWinHttpRequest(void) 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 ); hr = IWinHttpRequest_get_Status( req, NULL );

1 0

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

04 Dec '15

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

Alistair Leslie-Hughes : webservices: Add missing break.
by Alexandre Julliard 04 Dec '15

04 Dec '15

Module: wine Branch: master Commit: 7aefdc2f18beeb27e15c60c34ee93b88e50c3a6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aefdc2f18beeb27e15c60c34… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Dec 4 20:55:22 2015 +1100 webservices: Add missing break. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 10f3aab..f701dce 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -321,6 +321,7 @@ void free_node( struct node *node ) { WS_XML_COMMENT_NODE *comment = (WS_XML_COMMENT_NODE *)node; heap_free( comment->value.bytes ); + break; } case WS_XML_NODE_TYPE_END_ELEMENT: case WS_XML_NODE_TYPE_EOF:

1 0

Henri Verbeet : ddraw: Return DDERR_NOEXCLUSIVEMODE in ddraw_surface7_Flip () when not in exclusive mode.
by Alexandre Julliard 04 Dec '15

04 Dec '15

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

Henri Verbeet : ddraw: Mark surfaces as lost when the device window is deactivated.
by Alexandre Julliard 04 Dec '15

04 Dec '15

Module: wine Branch: master Commit: 1ebb42ca534b58221b32cbf687de2ace00b4cbfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ebb42ca534b58221b32cbf68… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 4 11:30:14 2015 +0100 ddraw: Mark surfaces as lost when the device window is deactivated. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 23 ++++++++++++++++++++--- dlls/ddraw/ddraw_private.h | 3 +++ dlls/ddraw/surface.c | 23 ++++++----------------- dlls/ddraw/tests/ddraw1.c | 8 ++++---- dlls/ddraw/tests/ddraw2.c | 8 ++++---- dlls/ddraw/tests/ddraw4.c | 8 ++++---- dlls/ddraw/tests/ddraw7.c | 8 ++++---- dlls/wined3d/surface.c | 25 +------------------------ dlls/wined3d/wined3d.spec | 2 -- dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d.h | 3 --- 11 files changed, 46 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ebb42ca534b58221b32c…

1 0

Henri Verbeet : ddraw: Do not mark surfaces as lost unconditionally when setting the cooperative level.
by Alexandre Julliard 04 Dec '15

04 Dec '15

Module: wine Branch: master Commit: 821c2ed6a3478fadeafe7c64213b5f0af5f19d57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=821c2ed6a3478fadeafe7c642… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 4 11:30:15 2015 +0100 ddraw: Do not mark surfaces as lost unconditionally when setting the cooperative level. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 13 ++++++- dlls/ddraw/tests/ddraw1.c | 74 ++++++++++++++++++++++++++++++++++------ dlls/ddraw/tests/ddraw2.c | 74 ++++++++++++++++++++++++++++++++++------ dlls/ddraw/tests/ddraw4.c | 86 +++++++++++++++++++++++++++++++++++++++++------ dlls/ddraw/tests/ddraw7.c | 86 +++++++++++++++++++++++++++++++++++++++++------ 5 files changed, 292 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=821c2ed6a3478fadeafe7…

1 0

Alexandre Julliard : tools: Allow running installed builtin apps even when the 32-bit loader is missing.
by Alexandre Julliard 04 Dec '15

04 Dec '15

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

Alexandre Julliard : gdi32: Fix StretchDIBits color mapping for monochrome bitmaps without a color table.
by Alexandre Julliard 04 Dec '15

04 Dec '15

Module: wine Branch: master Commit: eddc4609eca7589c021e181b1701ec25b1ee0e8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eddc4609eca7589c021e181b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 21:40:14 2015 +0900 gdi32: Fix StretchDIBits color mapping for monochrome bitmaps without a color table. This is the equivalent of df924f6a8ca6d4835c579141d16d866a574b380a for the StretchDIBits case. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dib.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 2817ede..cf1ebe4 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -567,22 +567,33 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he err = dev->funcs->pPutImage( dev, clip, dst_info, &src_bits, &src, &dst, rop ); if (err == ERROR_BAD_FORMAT) { + DWORD dst_colors = dst_info->bmiHeader.biClrUsed; + /* 1-bpp destination without a color table requires a fake 1-entry table - * that contains only the background color */ - if (dst_info->bmiHeader.biBitCount == 1 && !dst_info->bmiHeader.biClrUsed) + * that contains only the background color; except with a 1-bpp source, + * in which case it uses the source colors */ + if (dst_info->bmiHeader.biBitCount == 1 && !dst_colors) { - COLORREF color = GetBkColor( dev->hdc ); - dst_info->bmiColors[0].rgbRed = GetRValue( color ); - dst_info->bmiColors[0].rgbGreen = GetGValue( color ); - dst_info->bmiColors[0].rgbBlue = GetBValue( color ); - dst_info->bmiColors[0].rgbReserved = 0; - dst_info->bmiHeader.biClrUsed = 1; + if (src_info->bmiHeader.biBitCount > 1) + { + COLORREF color = GetBkColor( dev->hdc ); + dst_info->bmiColors[0].rgbRed = GetRValue( color ); + dst_info->bmiColors[0].rgbGreen = GetGValue( color ); + dst_info->bmiColors[0].rgbBlue = GetBValue( color ); + dst_info->bmiColors[0].rgbReserved = 0; + dst_info->bmiHeader.biClrUsed = 1; + } + else + { + memcpy( dst_info->bmiColors, src_info->bmiColors, 2 * sizeof(dst_info->bmiColors[0]) ); + dst_info->bmiHeader.biClrUsed = 2; + } } if (!(err = convert_bits( src_info, &src, dst_info, &src_bits ))) { /* get rid of the fake 1-bpp table */ - if (dst_info->bmiHeader.biClrUsed == 1) dst_info->bmiHeader.biClrUsed = 0; + dst_info->bmiHeader.biClrUsed = dst_colors; err = dev->funcs->pPutImage( dev, clip, dst_info, &src_bits, &src, &dst, rop ); } }

1 0

Piotr Caban : msiexec: Avoid broken pipe error caused by setting SERVICE_STOPPED state twice.
by Alexandre Julliard 04 Dec '15

04 Dec '15

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 : Release 1.8-rc3.
by Alexandre Julliard 04 Dec '15

04 Dec '15

Module: wine Branch: master Commit: ffee96a80c0585fb5fcb041382540e2014d2f77b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffee96a80c0585fb5fcb04138… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 23:17:34 2015 +0900 Release 1.8-rc3. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 374 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +-- 4 files changed, 177 insertions(+), 218 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffee96a80c0585fb5fcb0…

1 0