August 2008 - Wine-Commits - list.winehq.org

Alexandre Julliard : Include sys/filio. h to get the FIONREAD definition on Solaris.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: 220bc61c21380bd7cb454d46020f21da1fda6a72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=220bc61c21380bd7cb454d460… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 26 20:40:57 2008 +0200 Include sys/filio.h to get the FIONREAD definition on Solaris. --- dlls/ntdll/file.c | 3 +++ dlls/winhttp/net.c | 3 +++ dlls/wininet/netconnection.c | 3 +++ 3 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index d7f5b93..5746023 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -45,6 +45,9 @@ #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif +#ifdef HAVE_SYS_FILIO_H +# include <sys/filio.h> +#endif #ifdef HAVE_POLL_H #include <poll.h> #endif diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index a788b01..54ceb1c 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -31,6 +31,9 @@ #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif +#ifdef HAVE_SYS_FILIO_H +# include <sys/filio.h> +#endif #ifdef HAVE_POLL_H # include <poll.h> #endif diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 7f6fed7..77f39bb 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -37,6 +37,9 @@ #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif +#ifdef HAVE_SYS_FILIO_H +# include <sys/filio.h> +#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif

1 0

Alexandre Julliard : ntdll/tests: Handle a couple of failures on NT4.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: cf36931614352d8e2495d5a583c74ed01c48b182 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf36931614352d8e2495d5a58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 26 20:43:33 2008 +0200 ntdll/tests: Handle a couple of failures on NT4. --- dlls/ntdll/tests/env.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 0480e7a..aab9368 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -155,7 +155,9 @@ static void testSetHelper(LPWSTR* env, const char* var, const char* val, NTSTATU ok(lstrcmpW(bval1, bval2) == 0, "Cannot get value written to environment\n"); break; case STATUS_VARIABLE_NOT_FOUND: - ok(val == NULL, "Couldn't find variable, but didn't delete it. val = %s\n", val); + ok(val == NULL || + broken(strchr(var,'=') != NULL), /* variable containing '=' may be set but not found again on NT4 */ + "Couldn't find variable, but didn't delete it. val = %s\n", val); break; default: ok(0, "Wrong ret %u for %s\n", nts, var); @@ -178,7 +180,7 @@ static void testSet(void) testSetHelper(&env, "cat", NULL, STATUS_SUCCESS, 0); testSetHelper(&env, "cat", NULL, STATUS_SUCCESS, STATUS_VARIABLE_NOT_FOUND); testSetHelper(&env, "foo", "meouw", STATUS_SUCCESS, 0); - testSetHelper(&env, "me=too", "also", STATUS_INVALID_PARAMETER, 0); + testSetHelper(&env, "me=too", "also", STATUS_SUCCESS, STATUS_INVALID_PARAMETER); testSetHelper(&env, "me", "too=also", STATUS_SUCCESS, 0); testSetHelper(&env, "=too", "also", STATUS_SUCCESS, 0); testSetHelper(&env, "=", "also", STATUS_SUCCESS, 0);

1 0

Dmitry Timoshkov : user32: Partially revert 499c26ce66ec6cbbb3569c69ca95c9dfac01d39f.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: 5307a75c42aeff1b5f286fe3d9bd877a2306ab5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5307a75c42aeff1b5f286fe3d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Aug 26 20:43:54 2008 +0900 user32: Partially revert 499c26ce66ec6cbbb3569c69ca95c9dfac01d39f. This part of the patch really has nothing to do with an idea the patch aimed to achieve. --- dlls/user32/mdi.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 0594b55..fe70b80 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1257,7 +1257,7 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, return 0; case WM_SIZE: - if( ci->hwndChildMaximized ) + if( ci->hwndActiveChild && IsZoomed(ci->hwndActiveChild) ) { RECT rect; @@ -1265,10 +1265,9 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, rect.top = 0; rect.right = LOWORD(lParam); rect.bottom = HIWORD(lParam); - - AdjustWindowRectEx( &rect, GetWindowLongA(ci->hwndChildMaximized, GWL_STYLE), - 0, GetWindowLongA(ci->hwndChildMaximized, GWL_EXSTYLE) ); - MoveWindow( ci->hwndChildMaximized, rect.left, rect.top, + AdjustWindowRectEx(&rect, GetWindowLongA(ci->hwndActiveChild, GWL_STYLE), + 0, GetWindowLongA(ci->hwndActiveChild, GWL_EXSTYLE) ); + MoveWindow(ci->hwndActiveChild, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, 1); } else

1 0

Dmitry Timoshkov : user32: Add a test for monitor work area, fix some failures.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: dddec81dfbe13b202adbc36e59e6b92e0fe449f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dddec81dfbe13b202adbc36e5… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Aug 26 20:40:58 2008 +0900 user32: Add a test for monitor work area, fix some failures. --- dlls/user32/tests/monitor.c | 126 ++++++++++++++++++++++++++++++++++++++----- dlls/winex11.drv/xinerama.c | 6 ++- 2 files changed, 116 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 0de9bff..65d922e 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2,6 +2,7 @@ * Unit tests for monitor APIs * * Copyright 2005 Huw Davies + * Copyright 2008 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -61,7 +62,7 @@ static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, mi.cbSize = sizeof(mi); ok(pGetMonitorInfoA(hmon, (MONITORINFO*)&mi), "GetMonitorInfo failed\n"); - if(mi.dwFlags == MONITORINFOF_PRIMARY) + if (mi.dwFlags & MONITORINFOF_PRIMARY) strcpy(primary, mi.szDevice); return TRUE; @@ -73,9 +74,15 @@ static void test_enumdisplaydevices(void) char primary_device_name[32]; char primary_monitor_device_name[32]; DWORD primary_num = -1, num = 0; + BOOL ret; + + if (!pEnumDisplayDevicesA) + { + skip("EnumDisplayDevicesA is not available\n"); + return; + } dd.cb = sizeof(dd); - if(pEnumDisplayDevicesA == NULL) return; while(1) { BOOL ret; @@ -99,14 +106,18 @@ static void test_enumdisplaydevices(void) } ok(primary_num != -1, "Didn't get the primary device\n"); - if(pEnumDisplayMonitors && pGetMonitorInfoA) { - ok(pEnumDisplayMonitors(NULL, NULL, monitor_enum_proc, (LPARAM)primary_monitor_device_name), - "EnumDisplayMonitors failed\n"); - - ok(!strcmp(primary_monitor_device_name, primary_device_name), - "monitor device name %s, device name %s\n", primary_monitor_device_name, - primary_device_name); + if (!pEnumDisplayMonitors || !pGetMonitorInfoA) + { + skip("EnumDisplayMonitors or GetMonitorInfoA are not available\n"); + return; } + + primary_monitor_device_name[0] = 0; + ret = pEnumDisplayMonitors(NULL, NULL, monitor_enum_proc, (LPARAM)primary_monitor_device_name); + ok(ret, "EnumDisplayMonitors failed\n"); + ok(!strcmp(primary_monitor_device_name, primary_device_name), + "monitor device name %s, device name %s\n", primary_monitor_device_name, + primary_device_name); } struct vid_mode @@ -267,6 +278,12 @@ static void test_monitors(void) HMONITOR monitor, primary; POINT pt; + if (!pMonitorFromPoint || !pMonitorFromWindow) + { + skip("MonitorFromPoint or MonitorFromWindow are not available\n"); + return; + } + pt.x = pt.y = 0; primary = pMonitorFromPoint( pt, MONITOR_DEFAULTTOPRIMARY ); ok( primary != 0, "couldn't get primary monitor\n" ); @@ -279,15 +296,96 @@ static void test_monitors(void) ok( monitor == primary, "got %p, should get primary %p for MONITOR_DEFAULTTONEAREST\n", monitor, primary ); } +static BOOL CALLBACK find_primary_mon(HMONITOR hmon, HDC hdc, LPRECT rc, LPARAM lp) +{ + MONITORINFO mi; + BOOL ret; + + mi.cbSize = sizeof(mi); + ret = pGetMonitorInfoA(hmon, &mi); + ok(ret, "GetMonitorInfo failed\n"); + if (mi.dwFlags & MONITORINFOF_PRIMARY) + { + *(HMONITOR *)lp = hmon; + return FALSE; + } + return TRUE; +} + +static void test_work_area(void) +{ + HMONITOR hmon; + MONITORINFO mi; + RECT rc_work, rc_normal; + HWND hwnd; + WINDOWPLACEMENT wp; + BOOL ret; + + if (!pEnumDisplayMonitors || !pGetMonitorInfoA) + { + skip("EnumDisplayMonitors or GetMonitorInfoA are not available\n"); + return; + } + + hmon = 0; + ret = pEnumDisplayMonitors(NULL, NULL, find_primary_mon, (LPARAM)&hmon); + ok(!ret && hmon != 0, "Failed to find primary monitor\n"); + + mi.cbSize = sizeof(mi); + SetLastError(0xdeadbeef); + ret = pGetMonitorInfoA(hmon, &mi); + ok(ret, "GetMonitorInfo error %u\n", GetLastError()); + ok(mi.dwFlags & MONITORINFOF_PRIMARY, "not a primary monitor\n"); + trace("primary monitor (%d,%d-%d,%d)\n", + mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom); + + SetLastError(0xdeadbeef); + ret = SystemParametersInfo(SPI_GETWORKAREA, 0, &rc_work, 0); + ok(ret, "SystemParametersInfo error %u\n", GetLastError()); + trace("work area (%d,%d-%d,%d)\n", rc_work.left, rc_work.top, rc_work.right, rc_work.bottom); + ok(EqualRect(&rc_work, &mi.rcWork), "work area is different\n"); + + hwnd = CreateWindowEx(0, "static", NULL, WS_OVERLAPPEDWINDOW|WS_VISIBLE,100,100,10,10,0,0,0,NULL); + ok(hwnd != 0, "CreateWindowEx failed\n"); + + ret = GetWindowRect(hwnd, &rc_normal); + ok(ret, "GetWindowRect failed\n"); + trace("normal (%d,%d-%d,%d)\n", rc_normal.left, rc_normal.top, rc_normal.right, rc_normal.bottom); + + wp.length = sizeof(wp); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "GetWindowPlacement failed\n"); + trace("min: %d,%d max %d,%d normal %d,%d-%d,%d\n", + wp.ptMinPosition.x, wp.ptMinPosition.y, + wp.ptMaxPosition.x, wp.ptMaxPosition.y, + wp.rcNormalPosition.left, wp.rcNormalPosition.top, + wp.rcNormalPosition.right, wp.rcNormalPosition.bottom); + OffsetRect(&rc_normal, -rc_work.left, -rc_work.top); + if (!EqualRect(&mi.rcMonitor, &mi.rcWork)) /* FIXME: remove once Wine is fixed */ + todo_wine ok(EqualRect(&rc_normal, &wp.rcNormalPosition), "normal pos is different\n"); + else + ok(EqualRect(&rc_normal, &wp.rcNormalPosition), "normal pos is different\n"); + + SetWindowLong(hwnd, GWL_EXSTYLE, WS_EX_TOOLWINDOW); + + wp.length = sizeof(wp); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "GetWindowPlacement failed\n"); + trace("min: %d,%d max %d,%d normal %d,%d-%d,%d\n", + wp.ptMinPosition.x, wp.ptMinPosition.y, + wp.ptMaxPosition.x, wp.ptMaxPosition.y, + wp.rcNormalPosition.left, wp.rcNormalPosition.top, + wp.rcNormalPosition.right, wp.rcNormalPosition.bottom); + ok(EqualRect(&rc_normal, &wp.rcNormalPosition), "normal pos is different\n"); + + DestroyWindow(hwnd); +} START_TEST(monitor) { init_function_pointers(); test_enumdisplaydevices(); test_ChangeDisplaySettingsEx(); - - if (pMonitorFromPoint && pMonitorFromWindow) - test_monitors(); - else - skip("MonitorFromPoint and/or MonitorFromWindow are not available\n"); + test_monitors(); + test_work_area(); } diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index ee735e6..f68cf2a 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -218,7 +218,8 @@ BOOL X11DRV_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPA RECT monrect = monitors[i].rcMonitor; OffsetRect( &monrect, -origin.x, -origin.y ); if (IntersectRect( &monrect, &monrect, &limit )) - if (!proc( index_to_monitor(i), hdc, &monrect, lp )) break; + if (!proc( index_to_monitor(i), hdc, &monrect, lp )) + return FALSE; } } else @@ -227,7 +228,8 @@ BOOL X11DRV_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPA { RECT unused; if (!rect || IntersectRect( &unused, &monitors[i].rcMonitor, rect )) - if (!proc( index_to_monitor(i), 0, &monitors[i].rcMonitor, lp )) break; + if (!proc( index_to_monitor(i), 0, &monitors[i].rcMonitor, lp )) + return FALSE; } } return TRUE;

1 0

Paul Vriens : crypt32/tests: Use CryptAcquireContextA instead of CryptAcquireContextW.
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: 5f727cb2afbfafc3b396cf4902e55ca95dbc69d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f727cb2afbfafc3b396cf490… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 26 12:10:52 2008 +0200 crypt32/tests: Use CryptAcquireContextA instead of CryptAcquireContextW. --- dlls/crypt32/tests/msg.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 369576d..ba35b89 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1900,7 +1900,7 @@ static void test_signed_msg_get_param(void) if (!ret && GetLastError() == NTE_EXISTS) ret = pCryptAcquireContextA(&signer.hCryptProv, cspNameA, NULL, PROV_RSA_FULL, 0); - ok(ret, "CryptAcquireContextW failed: %x\n", GetLastError()); + ok(ret, "CryptAcquireContextA failed: %x\n", GetLastError()); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, CMSG_CRYPT_RELEASE_CONTEXT_FLAG, CMSG_SIGNED, &signInfo, NULL, NULL); ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); @@ -1935,12 +1935,12 @@ static void test_signed_msg_get_param(void) signer.SignerId.dwIdChoice = CERT_ID_KEY_IDENTIFIER; signer.SignerId.KeyId.cbData = sizeof(serialNum); signer.SignerId.KeyId.pbData = (BYTE *)serialNum; - ret = CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, + ret = pCryptAcquireContextA(&signer.hCryptProv, cspNameA, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET); if (!ret && GetLastError() == NTE_EXISTS) - ret = CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, + ret = pCryptAcquireContextA(&signer.hCryptProv, cspNameA, NULL, PROV_RSA_FULL, 0); - ok(ret, "CryptAcquireContextW failed: %x\n", GetLastError()); + ok(ret, "CryptAcquireContextA failed: %x\n", GetLastError()); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, CMSG_CRYPT_RELEASE_CONTEXT_FLAG, CMSG_SIGNED, &signInfo, NULL, NULL); ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); @@ -2791,6 +2791,8 @@ static BOOL detect_nt(void) CMSG_SIGNER_ENCODE_INFO signer = { sizeof(signer), 0 }; CERT_INFO certInfo = { 0 }; + if (!pCryptAcquireContextW) + return FALSE; certInfo.SerialNumber.cbData = sizeof(serialNum); certInfo.SerialNumber.pbData = serialNum;

1 0

Hans Leidekker : winhttp: Implement WinHttpWriteData.
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: 6619e54d1eaf5f62115e8fa43a2db16589e47c16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6619e54d1eaf5f62115e8fa43… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 26 11:05:02 2008 +0200 winhttp: Implement WinHttpWriteData. --- dlls/winhttp/main.c | 12 ------------ dlls/winhttp/request.c | 28 ++++++++++++++++++++++++++++ dlls/winhttp/tests/winhttp.c | 4 ++-- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 220cc51..2d3ec2f 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -105,18 +105,6 @@ BOOL WINAPI WinHttpSetOption (HINTERNET hInternet, DWORD dwOption, LPVOID lpBuff return FALSE; } -/*********************************************************************** - * WinHttpWriteData (winhttp.@) - */ -BOOL WINAPI WinHttpWriteData (HINTERNET hRequest, LPCVOID lpBuffer, - DWORD dwNumberOfBytesToWrite, LPDWORD lpdwNumberOfBytesWritten) -{ - FIXME("(%p, %d, %p): stub\n", lpBuffer, dwNumberOfBytesToWrite, lpdwNumberOfBytesWritten); - - SetLastError(ERROR_NOT_SUPPORTED); - return FALSE; -} - BOOL WINAPI InternetCrackUrlW( LPCWSTR, DWORD, DWORD, LPURL_COMPONENTSW ); BOOL WINAPI InternetCreateUrlW( LPURL_COMPONENTS, DWORD, LPWSTR, LPDWORD ); diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 21e59c7..0d5d203 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1109,3 +1109,31 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L release_object( &request->hdr ); return ret; } + +/*********************************************************************** + * WinHttpWriteData (winhttp.@) + */ +BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write, LPDWORD written ) +{ + BOOL ret; + request_t *request; + + TRACE("%p, %p, %d, %p\n", hrequest, buffer, to_write, written); + + if (!(request = (request_t *)grab_object( hrequest ))) + { + set_last_error( ERROR_INVALID_HANDLE ); + return FALSE; + } + if (request->hdr.type != WINHTTP_HANDLE_TYPE_REQUEST) + { + release_object( &request->hdr ); + set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + return FALSE; + } + + ret = netconn_send( &request->netconn, buffer, to_write, 0, (int *)written ); + + release_object( &request->hdr ); + return ret; +} diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index fa0249d..3fbb24c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -117,8 +117,8 @@ static void test_SendRequest (void) { bytes_rw = -1; ret = WinHttpWriteData(request, &post_data[i], 1, &bytes_rw); - todo_wine ok(ret == TRUE, "WinHttpWriteData failed: %u.\n", GetLastError()); - todo_wine ok(bytes_rw == 1, "WinHttpWriteData failed, wrote %u bytes instead of 1 byte.\n", bytes_rw); + ok(ret == TRUE, "WinHttpWriteData failed: %u.\n", GetLastError()); + ok(bytes_rw == 1, "WinHttpWriteData failed, wrote %u bytes instead of 1 byte.\n", bytes_rw); } ret = WinHttpReceiveResponse(request, NULL);

1 0

Hans Leidekker : winhttp: Remove some unneeded includes.
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: 18677beb571c641bc36d117ad550435b1c86c54e URL: http://source.winehq.org/git/wine.git/?a=commit;h=18677beb571c641bc36d117ad… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 26 11:05:23 2008 +0200 winhttp: Remove some unneeded includes. --- dlls/winhttp/handle.c | 1 - dlls/winhttp/request.c | 1 - dlls/winhttp/session.c | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/handle.c b/dlls/winhttp/handle.c index 6f542a3..7010727 100644 --- a/dlls/winhttp/handle.c +++ b/dlls/winhttp/handle.c @@ -26,7 +26,6 @@ #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winhttp.h" #include "winhttp_private.h" diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0d5d203..ef1582d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -27,7 +27,6 @@ #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winhttp.h" #include "winhttp_private.h" diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 6548c7f..169b98e 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -24,7 +24,6 @@ #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winhttp.h" #include "winhttp_private.h"

1 0

Hans Leidekker : winhttp: Implement WinHttpReadData.
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: 728bf77c83e331d821272131aaf8eb71600c2a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=728bf77c83e331d821272131a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 26 11:04:43 2008 +0200 winhttp: Implement WinHttpReadData. --- dlls/winhttp/main.c | 12 ---- dlls/winhttp/request.c | 133 ++++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/tests/winhttp.c | 8 +-- 3 files changed, 136 insertions(+), 17 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 82f0a61..220cc51 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -106,18 +106,6 @@ BOOL WINAPI WinHttpSetOption (HINTERNET hInternet, DWORD dwOption, LPVOID lpBuff } /*********************************************************************** - * WinHttpReadData (winhttp.@) - */ -BOOL WINAPI WinHttpReadData (HINTERNET hInternet, LPVOID lpBuffer, DWORD dwNumberOfBytesToRead, - LPDWORD lpdwNumberOfBytesRead) -{ - FIXME("(%d): stub\n", dwNumberOfBytesToRead); - - SetLastError(ERROR_NOT_SUPPORTED); - return FALSE; -} - -/*********************************************************************** * WinHttpWriteData (winhttp.@) */ BOOL WINAPI WinHttpWriteData (HINTERNET hRequest, LPCVOID lpBuffer, diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 14b57cc..21e59c7 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -976,3 +976,136 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) release_object( &request->hdr ); return ret; } + +static BOOL read_data( request_t *request, void *buffer, DWORD size, DWORD *read, BOOL async ) +{ + DWORD to_read; + int bytes_read; + + to_read = min( size, request->content_length - request->content_read ); + if (!netconn_recv( &request->netconn, buffer, to_read, async ? 0 : MSG_WAITALL, &bytes_read )) + { + if (bytes_read != to_read) + { + ERR("not all data received %d/%d\n", bytes_read, to_read); + } + /* always return success, even if the network layer returns an error */ + *read = 0; + return TRUE; + } + request->content_read += bytes_read; + *read = bytes_read; + return TRUE; +} + +static DWORD get_chunk_size( const char *buffer ) +{ + const char *p; + DWORD size = 0; + + for (p = buffer; *p; p++) + { + if (*p >= '0' && *p <= '9') size = size * 16 + *p - '0'; + else if (*p >= 'a' && *p <= 'f') size = size * 16 + *p - 'a' + 10; + else if (*p >= 'A' && *p <= 'F') size = size * 16 + *p - 'A' + 10; + else if (*p == ';') break; + } + return size; +} + +static BOOL read_data_chunked( request_t *request, void *buffer, DWORD size, DWORD *read, BOOL async ) +{ + char reply[MAX_REPLY_LEN], *p = buffer; + DWORD buflen, to_read, to_write = size; + int bytes_read; + + *read = 0; + for (;;) + { + if (*read == size) break; + + if (request->content_length == ~0UL) /* new chunk */ + { + buflen = sizeof(reply); + if (!netconn_get_next_line( &request->netconn, reply, &buflen )) break; + + if (!(request->content_length = get_chunk_size( reply ))) + { + /* zero sized chunk marks end of transfer; read any trailing headers and return */ + receive_response( request, FALSE ); + break; + } + } + to_read = min( to_write, request->content_length - request->content_read ); + + if (!netconn_recv( &request->netconn, p, to_read, async ? 0 : MSG_WAITALL, &bytes_read )) + { + if (bytes_read != to_read) + { + ERR("Not all data received %d/%d\n", bytes_read, to_read); + } + /* always return success, even if the network layer returns an error */ + *read = 0; + break; + } + if (!bytes_read) break; + + request->content_read += bytes_read; + to_write -= bytes_read; + *read += bytes_read; + p += bytes_read; + + if (request->content_read == request->content_length) /* chunk complete */ + { + request->content_read = 0; + request->content_length = ~0UL; + + buflen = sizeof(reply); + if (!netconn_get_next_line( &request->netconn, reply, &buflen )) + { + ERR("Malformed chunk\n"); + *read = 0; + break; + } + } + } + return TRUE; +} + +/*********************************************************************** + * WinHttpReadData (winhttp.@) + */ +BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, LPDWORD read ) +{ + static const WCHAR chunked[] = {'c','h','u','n','k','e','d',0}; + + BOOL ret; + request_t *request; + WCHAR encoding[20]; + DWORD buflen = sizeof(encoding); + + TRACE("%p, %p, %d, %p\n", hrequest, buffer, to_read, read); + + if (!(request = (request_t *)grab_object( hrequest ))) + { + set_last_error( ERROR_INVALID_HANDLE ); + return FALSE; + } + if (request->hdr.type != WINHTTP_HANDLE_TYPE_REQUEST) + { + release_object( &request->hdr ); + set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + return FALSE; + } + + if (query_headers( request, WINHTTP_QUERY_TRANSFER_ENCODING, NULL, encoding, &buflen, NULL ) && + !strcmpiW( encoding, chunked )) + { + ret = read_data_chunked( request, buffer, to_read, read, request->hdr.flags & WINHTTP_FLAG_ASYNC ); + } + else + ret = read_data( request, buffer, to_read, read, request->hdr.flags & WINHTTP_FLAG_ASYNC ); + + release_object( &request->hdr ); + return ret; +} diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index a247938..fa0249d 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -126,12 +126,10 @@ static void test_SendRequest (void) bytes_rw = -1; ret = WinHttpReadData(request, buffer, sizeof(buffer) - 1, &bytes_rw); - todo_wine ok(ret == TRUE, "WinHttpReadData failed: %u.\n", GetLastError()); + ok(ret == TRUE, "WinHttpReadData failed: %u.\n", GetLastError()); - todo_wine ok(bytes_rw == strlen(test_post), "Read %u bytes instead of %d.\n", - bytes_rw, lstrlen(test_post)); - todo_wine ok(strncmp(buffer, test_post, bytes_rw) == 0, - "Data read did not match, got '%s'.\n", buffer); + ok(bytes_rw == strlen(test_post), "Read %u bytes instead of %d.\n", bytes_rw, lstrlen(test_post)); + ok(strncmp(buffer, test_post, bytes_rw) == 0, "Data read did not match, got '%s'.\n", buffer); ret = WinHttpCloseHandle(request); ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret);

1 0

Hans Leidekker : winhttp: Implement WinHttpQueryDataAvailable.
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: d7f54676526454bfe2eefe0d26f66f6a292f71d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f54676526454bfe2eefe0d2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 26 11:04:22 2008 +0200 winhttp: Implement WinHttpQueryDataAvailable. --- dlls/winhttp/main.c | 11 ----------- dlls/winhttp/request.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index a87d5ab..82f0a61 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -95,17 +95,6 @@ BOOL WINAPI WinHttpQueryOption (HINTERNET hInternet, DWORD dwOption, LPVOID lpBu } /*********************************************************************** - * WinHttpQueryDataAvailable (winhttp.@) - */ -BOOL WINAPI WinHttpQueryDataAvailable (HINTERNET hInternet, LPDWORD lpdwNumberOfBytesAvailable) -{ - FIXME("stub\n"); - - SetLastError(ERROR_NOT_SUPPORTED); - return FALSE; -} - -/*********************************************************************** * WinHttpSetOption (winhttp.@) */ BOOL WINAPI WinHttpSetOption (HINTERNET hInternet, DWORD dwOption, LPVOID lpBuffer, DWORD dwBufferLength) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 954f576..14b57cc 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -948,3 +948,31 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) release_object( &request->hdr ); return ret; } + +/*********************************************************************** + * WinHttpQueryDataAvailable (winhttp.@) + */ +BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) +{ + BOOL ret; + request_t *request; + + TRACE("%p, %p\n", hrequest, available); + + if (!(request = (request_t *)grab_object( hrequest ))) + { + set_last_error( ERROR_INVALID_HANDLE ); + return FALSE; + } + if (request->hdr.type != WINHTTP_HANDLE_TYPE_REQUEST) + { + release_object( &request->hdr ); + set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + return FALSE; + } + + ret = netconn_query_data_available( &request->netconn, available ); + + release_object( &request->hdr ); + return ret; +}

1 0

Hans Leidekker : winhttp: Implement WinHttpReceiveResponse.
by Alexandre Julliard Aug. 26, 2008

Aug. 26, 2008

Module: wine Branch: master Commit: b170ac20dd615e93c8831757d67e80b91f430abd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b170ac20dd615e93c8831757d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 26 11:04:04 2008 +0200 winhttp: Implement WinHttpReceiveResponse. --- dlls/winhttp/main.c | 11 --- dlls/winhttp/request.c | 156 +++++++++++++++++++++++++++++++++++++++++- dlls/winhttp/tests/winhttp.c | 2 +- 3 files changed, 155 insertions(+), 14 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 3fb3026..a87d5ab 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -106,17 +106,6 @@ BOOL WINAPI WinHttpQueryDataAvailable (HINTERNET hInternet, LPDWORD lpdwNumberOf } /*********************************************************************** - * WinHttpReceiveResponse (winhttp.@) - */ -BOOL WINAPI WinHttpReceiveResponse (HINTERNET hRequest, LPVOID lpReserved) -{ - FIXME("stub\n"); - - SetLastError(ERROR_NOT_SUPPORTED); - return FALSE; -} - -/*********************************************************************** * WinHttpSetOption (winhttp.@) */ BOOL WINAPI WinHttpSetOption (HINTERNET hInternet, DWORD dwOption, LPVOID lpBuffer, DWORD dwBufferLength) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 8a32320..954f576 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -278,8 +278,6 @@ static BOOL insert_header( request_t *request, header_t *header ) DWORD count; header_t *hdrs; - TRACE("inserting %s: %s\n", debugstr_w(header->field), debugstr_w(header->value)); - count = request->num_headers + 1; if (count > 1) hdrs = heap_realloc_zero( request->headers, sizeof(header_t) * count ); @@ -796,3 +794,157 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD heade release_object( &request->hdr ); return ret; } + +static void clear_response_headers( request_t *request ) +{ + unsigned int i; + + for (i = 0; i < request->num_headers; i++) + { + if (!request->headers[i].field) continue; + if (!request->headers[i].value) continue; + if (request->headers[i].is_request) continue; + delete_header( request, i ); + i--; + } +} + +#define MAX_REPLY_LEN 1460 +#define INITIAL_HEADER_BUFFER_SIZE 512 + +static BOOL receive_response( request_t *request, BOOL clear ) +{ + static const WCHAR crlf[] = {'\r','\n',0}; + + char buffer[MAX_REPLY_LEN]; + DWORD buflen, len, offset, received_len, crlf_len = 2; /* strlenW(crlf) */ + char *status_code, *status_text; + WCHAR *versionW, *status_textW, *raw_headers; + WCHAR status_codeW[4]; /* sizeof("nnn") */ + + if (!netconn_connected( &request->netconn )) return FALSE; + + /* clear old response headers (eg. from a redirect response) */ + if (clear) clear_response_headers( request ); + + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); + + received_len = 0; + do + { + buflen = MAX_REPLY_LEN; + if (!netconn_get_next_line( &request->netconn, buffer, &buflen )) return FALSE; + received_len += buflen; + + /* first line should look like 'HTTP/1.x nnn OK' where nnn is the status code */ + if (!(status_code = strchr( buffer, ' ' ))) return FALSE; + status_code++; + if (!(status_text = strchr( status_code, ' ' ))) return FALSE; + if ((len = status_text - status_code) != sizeof("nnn") - 1) return FALSE; + status_text++; + + TRACE("version [%s] status code [%s] status text [%s]\n", + debugstr_an(buffer, status_code - buffer - 1), + debugstr_an(status_code, len), + debugstr_a(status_text)); + + } while (!memcmp( status_code, "100", len )); /* ignore "100 Continue" responses */ + + /* we rely on the fact that the protocol is ascii */ + MultiByteToWideChar( CP_ACP, 0, status_code, len, status_codeW, len ); + status_codeW[len] = 0; + if (!(process_header( request, attr_status, status_codeW, WINHTTP_ADDREQ_FLAG_REPLACE, FALSE ))) return FALSE; + + len = status_code - buffer; + if (!(versionW = heap_alloc( len * sizeof(WCHAR) ))) return FALSE; + MultiByteToWideChar( CP_ACP, 0, buffer, len - 1, versionW, len -1 ); + versionW[len - 1] = 0; + + heap_free( request->version ); + request->version = versionW; + + len = buflen - (status_text - buffer); + if (!(status_textW = heap_alloc( len * sizeof(WCHAR) ))) return FALSE; + MultiByteToWideChar( CP_ACP, 0, status_text, len, status_textW, len ); + + heap_free( request->status_text ); + request->status_text = status_textW; + + len = max( buflen + crlf_len, INITIAL_HEADER_BUFFER_SIZE ); + if (!(raw_headers = heap_alloc( len * sizeof(WCHAR) ))) return FALSE; + MultiByteToWideChar( CP_ACP, 0, buffer, buflen, raw_headers, buflen ); + memcpy( raw_headers + buflen - 1, crlf, sizeof(crlf) ); + + heap_free( request->raw_headers ); + request->raw_headers = raw_headers; + + offset = buflen + crlf_len - 1; + for (;;) + { + header_t *header; + + buflen = MAX_REPLY_LEN; + if (!netconn_get_next_line( &request->netconn, buffer, &buflen )) goto end; + received_len += buflen; + if (!*buffer) break; + + while (len - offset < buflen + crlf_len) + { + WCHAR *tmp; + len *= 2; + if (!(tmp = heap_realloc( raw_headers, len * sizeof(WCHAR) ))) return FALSE; + request->raw_headers = raw_headers = tmp; + } + MultiByteToWideChar( CP_ACP, 0, buffer, buflen, raw_headers + offset, buflen ); + + if (!(header = parse_header( raw_headers + offset ))) break; + if (!(process_header( request, header->field, header->value, WINHTTP_ADDREQ_FLAG_ADD, FALSE ))) + { + free_header( header ); + break; + } + free_header( header ); + memcpy( raw_headers + offset + buflen - 1, crlf, sizeof(crlf) ); + offset += buflen + crlf_len - 1; + } + + TRACE("raw headers: %s\n", debugstr_w(raw_headers)); + +end: + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, &received_len, sizeof(DWORD) ); + return TRUE; +} + +/*********************************************************************** + * WinHttpReceiveResponse (winhttp.@) + */ +BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) +{ + BOOL ret = TRUE; + request_t *request; + DWORD size, query; + + TRACE("%p, %p\n", hrequest, reserved); + + if (!(request = (request_t *)grab_object( hrequest ))) + { + set_last_error( ERROR_INVALID_HANDLE ); + return FALSE; + } + if (request->hdr.type != WINHTTP_HANDLE_TYPE_REQUEST) + { + release_object( &request->hdr ); + set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); + return FALSE; + } + + ret = receive_response( request, TRUE ); + + size = sizeof(DWORD); + query = WINHTTP_QUERY_CONTENT_LENGTH | WINHTTP_QUERY_FLAG_NUMBER; + if (!query_headers( request, query, NULL, &request->content_length, &size, NULL )) + request->content_length = ~0UL; + + release_object( &request->hdr ); + return ret; +} diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 985c7de..a247938 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -122,7 +122,7 @@ static void test_SendRequest (void) } ret = WinHttpReceiveResponse(request, NULL); - todo_wine ok(ret == TRUE, "WinHttpReceiveResponse failed: %u.\n", GetLastError()); + ok(ret == TRUE, "WinHttpReceiveResponse failed: %u.\n", GetLastError()); bytes_rw = -1; ret = WinHttpReadData(request, buffer, sizeof(buffer) - 1, &bytes_rw);

1 0