February 2008 - Wine-commits

Alexandre Julliard : shell32: Add support for the NoDrives registry key.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: ab820ef24ccc37375335eac543cda04c4c264405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab820ef24ccc37375335eac54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 15 10:58:14 2008 +0100 shell32: Add support for the NoDrives registry key. --- dlls/shell32/shfldr_mycomp.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 39 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index af9958e..213b5d4 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -252,6 +252,44 @@ static HRESULT WINAPI ISF_MyComputer_fnParseDisplayName (IShellFolder2 *iface, return hr; } +/* retrieve a map of drives that should be displayed */ +static DWORD get_drive_map(void) +{ + static const WCHAR policiesW[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'P','o','l','i','c','i','e','s','\\', + 'E','x','p','l','o','r','e','r',0}; + static const WCHAR nodrivesW[] = {'N','o','D','r','i','v','e','s',0}; + static DWORD drive_mask, init_done; + + if (!init_done) + { + DWORD type, size, data, mask = 0; + HKEY hkey; + + if (!RegOpenKeyW( HKEY_LOCAL_MACHINE, policiesW, &hkey )) + { + size = sizeof(data); + if (!RegQueryValueExW( hkey, nodrivesW, NULL, &type, (LPBYTE)&data, &size ) && type == REG_DWORD) + mask |= data; + RegCloseKey( hkey ); + } + if (!RegOpenKeyW( HKEY_CURRENT_USER, policiesW, &hkey )) + { + size = sizeof(data); + if (!RegQueryValueExW( hkey, nodrivesW, NULL, &type, (LPBYTE)&data, &size ) && type == REG_DWORD) + mask |= data; + RegCloseKey( hkey ); + } + drive_mask = mask; + init_done = 1; + } + + return GetLogicalDrives() & ~drive_mask; +} + /************************************************************************** * CreateMyCompEnumList() */ @@ -271,7 +309,7 @@ static BOOL CreateMyCompEnumList(IEnumIDList *list, DWORD dwFlags) if (dwFlags & SHCONTF_FOLDERS) { WCHAR wszDriveName[] = {'A', ':', '\\', '\0'}; - DWORD dwDrivemap = GetLogicalDrives(); + DWORD dwDrivemap = get_drive_map(); HKEY hkey; UINT i;

1 0

Paul Vriens : netapi32/tests: Adding a user with a too long name succeeds on NT4.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: dd8fe5a97301bf3dc6b981910a45da8067c827d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd8fe5a97301bf3dc6b981910… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Feb 14 14:35:47 2008 +0100 netapi32/tests: Adding a user with a too long name succeeds on NT4. --- dlls/netapi32/tests/access.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 3861768..202c259 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -244,7 +244,17 @@ static void run_userhandling_tests(void) usri.usri1_password = sTestUserOldPass; ret = pNetUserAdd(NULL, 1, (LPBYTE)&usri, NULL); - ok(ret == NERR_BadUsername, "Adding user with too long username returned 0x%08x\n", ret); + if (ret == NERR_Success || ret == NERR_UserExists) + { + /* Windows NT4 does create the user. Delete the user and also if it already existed + * due to a previous test run on NT4. + */ + trace("We are on NT4, we have to delete the user with the too long username\n"); + ret = pNetUserDel(NULL, sTooLongName); + ok(ret == NERR_Success, "Deleting the user failed : %d\n", ret); + } + else + ok(ret == NERR_BadUsername, "Adding user with too long username returned 0x%08x\n", ret); usri.usri1_name = sTestUserName; usri.usri1_password = sTooLongPassword; @@ -256,7 +266,10 @@ static void run_userhandling_tests(void) usri.usri1_password = sTooLongPassword; ret = pNetUserAdd(NULL, 1, (LPBYTE)&usri, NULL); - ok(ret == NERR_BadUsername, + /* NT4 doesn't have a problem with the username so it will report the too long password + * as the error. NERR_PasswordTooShort is reported for all kind of password related errors. + */ + ok(ret == NERR_BadUsername || ret == NERR_PasswordTooShort, "Adding user with too long username/password returned 0x%08x\n", ret); usri.usri1_name = sTestUserName;

1 0

Huw Davies : inetcomm: Improve some TRACEs.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 5f8c766528c2c1b719fcf3aae8816b85ea35d712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f8c766528c2c1b719fcf3aae… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 12:37:43 2008 +0000 inetcomm: Improve some TRACEs. --- dlls/inetcomm/mimeole.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index dd47a68..1fd9983 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -820,7 +820,7 @@ static HRESULT WINAPI MimeBody_SetOption( const TYPEDID oid, LPCPROPVARIANT pValue) { - FIXME("stub\n"); + FIXME("(%p)->(%08x, %p): stub\n", iface, oid, pValue); return E_NOTIMPL; } @@ -829,7 +829,7 @@ static HRESULT WINAPI MimeBody_GetOption( const TYPEDID oid, LPPROPVARIANT pValue) { - FIXME("stub\n"); + FIXME("(%p)->(%08x, %p): stub\n", iface, oid, pValue); return E_NOTIMPL; } @@ -846,7 +846,7 @@ static HRESULT WINAPI MimeBody_IsType( IMimeBody* iface, IMSGBODYTYPE bodytype) { - FIXME("stub\n"); + FIXME("(%p)->(%d): stub\n", iface, bodytype); return E_NOTIMPL; } @@ -2134,7 +2134,7 @@ static HRESULT WINAPI MimeMessage_SetOption( const TYPEDID oid, LPCPROPVARIANT pValue) { - FIXME("(%p)->(%d, %p)\n", iface, oid, pValue); + FIXME("(%p)->(%08x, %p)\n", iface, oid, pValue); return E_NOTIMPL; } @@ -2143,7 +2143,7 @@ static HRESULT WINAPI MimeMessage_GetOption( const TYPEDID oid, LPPROPVARIANT pValue) { - FIXME("(%p)->(%d, %p)\n", iface, oid, pValue); + FIXME("(%p)->(%08x, %p)\n", iface, oid, pValue); return E_NOTIMPL; }

1 0

Huw Davies : inetcomm: Add IStream_CopyTo to the sub-stream implementation.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: cc0a458f92422a0039e46149d4f1ae30ab92a035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc0a458f92422a0039e46149d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 13:53:49 2008 +0000 inetcomm: Add IStream_CopyTo to the sub-stream implementation. --- dlls/inetcomm/mimeole.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 1fd9983..a0da6b9 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1251,8 +1251,46 @@ static HRESULT WINAPI sub_stream_CopyTo( ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten) { - FIXME("stub\n"); - return E_NOTIMPL; + HRESULT hr = S_OK; + BYTE tmpBuffer[128]; + ULONG bytesRead, bytesWritten, copySize; + ULARGE_INTEGER totalBytesRead; + ULARGE_INTEGER totalBytesWritten; + + TRACE("(%p)->(%p, %d, %p, %p)\n", iface, pstm, cb.LowPart, pcbRead, pcbWritten); + + totalBytesRead.QuadPart = 0; + totalBytesWritten.QuadPart = 0; + + while ( cb.QuadPart > 0 ) + { + if ( cb.QuadPart >= sizeof(tmpBuffer) ) + copySize = sizeof(tmpBuffer); + else + copySize = cb.u.LowPart; + + hr = IStream_Read(iface, tmpBuffer, copySize, &bytesRead); + if (FAILED(hr)) break; + + totalBytesRead.QuadPart += bytesRead; + + if (bytesRead) + { + hr = IStream_Write(pstm, tmpBuffer, bytesRead, &bytesWritten); + if (FAILED(hr)) break; + totalBytesWritten.QuadPart += bytesWritten; + } + + if (bytesRead != copySize) + cb.QuadPart = 0; + else + cb.QuadPart -= bytesRead; + } + + if (pcbRead) pcbRead->QuadPart = totalBytesRead.QuadPart; + if (pcbWritten) pcbWritten->QuadPart = totalBytesWritten.QuadPart; + + return hr; } static HRESULT WINAPI sub_stream_Commit(

1 0

Vitaliy Margolen : Revert "dinput: Skip old mouse movement events.".
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: eca356829c558a5fc4697856fd5faf6a0f7bef8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca356829c558a5fc4697856f… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Feb 14 00:15:03 2008 -0700 Revert "dinput: Skip old mouse movement events.". This reverts commit 31876695120f2fe6b4ecf60d73c36472607e5bf2. --- dlls/dinput/mouse.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 91f541f..93b70a1 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -64,7 +64,6 @@ struct SysMouseImpl BOOL need_warp; DWORD last_warped; - DWORD last_event_time; /* This is for mouse reporting. */ DIMOUSESTATE2 m_state; }; @@ -281,9 +280,6 @@ static void dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARA { POINT pt, pt1; - /* Skip old movement events */ - if (This->last_event_time - hook->time < 2000) break; - GetCursorPos(&pt); This->m_state.lX += pt.x = hook->pt.x - pt.x; This->m_state.lY += pt.y = hook->pt.y - pt.y; @@ -359,8 +355,6 @@ static void dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARA wdata, hook->time, This->base.dinput->evsequence++); } - This->last_event_time = hook->time; - LeaveCriticalSection(&This->base.crit); }

1 0

Vitaliy Margolen : dinput: Don't use event times, report current tick count instead.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 971c4e19d67153a1e0f0ebb74ea577baa92f1ac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=971c4e19d67153a1e0f0ebb74… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Feb 14 00:18:51 2008 -0700 dinput: Don't use event times, report current tick count instead. --- dlls/dinput/mouse.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 93b70a1..70c65cf 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -301,7 +301,7 @@ static void dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARA /* Already have X, need to queue it */ if (inst_id != -1) queue_event((LPDIRECTINPUTDEVICE8A)This, id_to_offset(&This->base.data_format, inst_id), - wdata, hook->time, This->base.dinput->evsequence); + wdata, GetCurrentTime(), This->base.dinput->evsequence); inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_Y_AXIS_INSTANCE) | DIDFT_RELAXIS; wdata = pt1.y; } @@ -352,7 +352,7 @@ static void dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARA { _dump_mouse_state(&This->m_state); queue_event((LPDIRECTINPUTDEVICE8A)This, id_to_offset(&This->base.data_format, inst_id), - wdata, hook->time, This->base.dinput->evsequence++); + wdata, GetCurrentTime(), This->base.dinput->evsequence++); } LeaveCriticalSection(&This->base.crit);

1 0

Dmitry Timoshkov : user32: Use custom window procs instead of DefWindowProcA/ W in the IsWindowUnicode test.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 3d421a47834ba2328bf609c709886e487a0736b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d421a47834ba2328bf609c70… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Feb 14 16:35:03 2008 +0800 user32: Use custom window procs instead of DefWindowProcA/W in the IsWindowUnicode test. --- dlls/user32/tests/win.c | 40 +++++++++++++++++++++++++--------------- 1 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 7e4c98c..4be1d87 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3597,6 +3597,16 @@ static void test_csparentdc(void) DestroyWindow(hwnd2); } +static LRESULT WINAPI def_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static LRESULT WINAPI def_window_procW(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + return DefWindowProcW(hwnd, msg, wparam, lparam); +} + static void test_IsWindowUnicode(void) { static const char ansi_class_nameA[] = "ansi class name"; @@ -3609,13 +3619,13 @@ static void test_IsWindowUnicode(void) memset(&classW, 0, sizeof(classW)); classW.hInstance = GetModuleHandleA(0); - classW.lpfnWndProc = DefWindowProcW; + classW.lpfnWndProc = def_window_procW; classW.lpszClassName = unicode_class_nameW; - if (!RegisterClassW(&classW)) return; + if (!RegisterClassW(&classW)) return; /* this catches Win9x as well */ memset(&classA, 0, sizeof(classA)); classA.hInstance = GetModuleHandleA(0); - classA.lpfnWndProc = DefWindowProcA; + classA.lpfnWndProc = def_window_procA; classA.lpszClassName = ansi_class_nameA; assert(RegisterClassA(&classA)); @@ -3625,9 +3635,9 @@ static void test_IsWindowUnicode(void) assert(hwnd); ok(IsWindowUnicode(hwnd), "IsWindowUnicode expected to return TRUE\n"); - SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (ULONG_PTR)DefWindowProcA); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (ULONG_PTR)def_window_procA); ok(!IsWindowUnicode(hwnd), "IsWindowUnicode expected to return FALSE\n"); - SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (ULONG_PTR)DefWindowProcW); + SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (ULONG_PTR)def_window_procW); ok(IsWindowUnicode(hwnd), "IsWindowUnicode expected to return TRUE\n"); DestroyWindow(hwnd); @@ -3637,9 +3647,9 @@ static void test_IsWindowUnicode(void) assert(hwnd); ok(IsWindowUnicode(hwnd), "IsWindowUnicode expected to return TRUE\n"); - SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (ULONG_PTR)DefWindowProcA); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (ULONG_PTR)def_window_procA); ok(!IsWindowUnicode(hwnd), "IsWindowUnicode expected to return FALSE\n"); - SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (ULONG_PTR)DefWindowProcW); + SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (ULONG_PTR)def_window_procW); ok(IsWindowUnicode(hwnd), "IsWindowUnicode expected to return TRUE\n"); DestroyWindow(hwnd); @@ -3650,9 +3660,9 @@ static void test_IsWindowUnicode(void) assert(hwnd); ok(!IsWindowUnicode(hwnd), "IsWindowUnicode expected to return FALSE\n"); - SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (ULONG_PTR)DefWindowProcW); + SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (ULONG_PTR)def_window_procW); ok(IsWindowUnicode(hwnd), "IsWindowUnicode expected to return TRUE\n"); - SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (ULONG_PTR)DefWindowProcA); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (ULONG_PTR)def_window_procA); ok(!IsWindowUnicode(hwnd), "IsWindowUnicode expected to return FALSE\n"); DestroyWindow(hwnd); @@ -3662,9 +3672,9 @@ static void test_IsWindowUnicode(void) assert(hwnd); ok(!IsWindowUnicode(hwnd), "IsWindowUnicode expected to return FALSE\n"); - SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (ULONG_PTR)DefWindowProcW); + SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (ULONG_PTR)def_window_procW); ok(IsWindowUnicode(hwnd), "IsWindowUnicode expected to return TRUE\n"); - SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (ULONG_PTR)DefWindowProcA); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (ULONG_PTR)def_window_procA); ok(!IsWindowUnicode(hwnd), "IsWindowUnicode expected to return FALSE\n"); DestroyWindow(hwnd); @@ -3675,7 +3685,7 @@ static void test_IsWindowUnicode(void) assert(hwnd); ok(IsWindowUnicode(hwnd), "IsWindowUnicode expected to return TRUE\n"); - SetClassLongPtrA(hwnd, GCLP_WNDPROC, (ULONG_PTR)DefWindowProcA); + SetClassLongPtrA(hwnd, GCLP_WNDPROC, (ULONG_PTR)def_window_procA); ok(IsWindowUnicode(hwnd), "IsWindowUnicode expected to return TRUE\n"); /* do not restore class window proc back to unicode */ @@ -3686,7 +3696,7 @@ static void test_IsWindowUnicode(void) assert(hwnd); ok(!IsWindowUnicode(hwnd), "IsWindowUnicode expected to return FALSE\n"); - SetClassLongPtrW(hwnd, GCLP_WNDPROC, (ULONG_PTR)DefWindowProcW); + SetClassLongPtrW(hwnd, GCLP_WNDPROC, (ULONG_PTR)def_window_procW); ok(!IsWindowUnicode(hwnd), "IsWindowUnicode expected to return FALSE\n"); DestroyWindow(hwnd); @@ -3697,7 +3707,7 @@ static void test_IsWindowUnicode(void) assert(hwnd); ok(!IsWindowUnicode(hwnd), "IsWindowUnicode expected to return FALSE\n"); - SetClassLongPtrW(hwnd, GCLP_WNDPROC, (ULONG_PTR)DefWindowProcW); + SetClassLongPtrW(hwnd, GCLP_WNDPROC, (ULONG_PTR)def_window_procW); ok(!IsWindowUnicode(hwnd), "IsWindowUnicode expected to return FALSE\n"); /* do not restore class window proc back to ansi */ @@ -3708,7 +3718,7 @@ static void test_IsWindowUnicode(void) assert(hwnd); ok(IsWindowUnicode(hwnd), "IsWindowUnicode expected to return TRUE\n"); - SetClassLongPtrA(hwnd, GCLP_WNDPROC, (ULONG_PTR)DefWindowProcA); + SetClassLongPtrA(hwnd, GCLP_WNDPROC, (ULONG_PTR)def_window_procA); ok(IsWindowUnicode(hwnd), "IsWindowUnicode expected to return TRUE\n"); DestroyWindow(hwnd);

1 0

Jacek Caban : wininet: Added correct InternetQueryOption( INTERNET_OPTION_DATAFILE_NAME) implementation.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 6ce88e0aab64bdaa4e01924ef81ae720508e4931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ce88e0aab64bdaa4e01924ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 13 13:33:24 2008 +0100 wininet: Added correct InternetQueryOption(INTERNET_OPTION_DATAFILE_NAME) implementation. --- dlls/wininet/internet.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 7f422da..c5b6a9f 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2049,8 +2049,9 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d } case INTERNET_OPTION_URL: - case INTERNET_OPTION_DATAFILE_NAME: { + TRACE("INTERNET_OPTION_URL\n"); + if (!lpwhh) { WARN("Invalid hInternet handle\n"); @@ -2094,6 +2095,52 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d } break; } + + case INTERNET_OPTION_DATAFILE_NAME: + { + TRACE("INTERNET_OPTION_DATAFILE_NAME\n"); + if (!lpwhh) + { + WARN("Invalid hInternet handle\n"); + INTERNET_SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (lpwhh->htype == WH_HHTTPREQ) + { + LPWININETHTTPREQW lpreq = (LPWININETHTTPREQW) lpwhh; + DWORD size; + + if(!lpreq->lpszCacheFile) { + *lpdwBufferLength = 0; + INTERNET_SetLastError(ERROR_INTERNET_ITEM_NOT_FOUND); + } + else if(bIsUnicode) + { + size = (lstrlenW(lpreq->lpszCacheFile)+1) * sizeof(WCHAR); + if (*lpdwBufferLength < size) + INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); + else + { + memcpy(lpBuffer, lpreq->lpszCacheFile, size); + bSuccess = TRUE; + } + *lpdwBufferLength = size; + } + else + { + size = WideCharToMultiByte(CP_ACP, 0, lpreq->lpszCacheFile, -1, NULL, 0, NULL, NULL); + if (size > *lpdwBufferLength) { + INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); + }else { + *lpdwBufferLength = WideCharToMultiByte(CP_ACP, 0, lpreq->lpszCacheFile, + -1, lpBuffer, *lpdwBufferLength, NULL, NULL); + bSuccess = TRUE; + } + } + } + break; + } + case INTERNET_OPTION_HTTP_VERSION: { if (*lpdwBufferLength < sizeof(HTTP_VERSION_INFO))

1 0

Jacek Caban : wininet: Added cache test.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: e49e792849d2d30dcad0e74248507ea32352b696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e49e792849d2d30dcad0e7424… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 13 13:33:42 2008 +0100 wininet: Added cache test. --- dlls/wininet/tests/http.c | 112 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 108 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index f48f61f..910771d 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -233,6 +233,7 @@ static VOID WINAPI callback( static void InternetReadFile_test(int flags) { + BOOL res; DWORD rc; CHAR buffer[4000]; DWORD length; @@ -286,6 +287,11 @@ static void InternetReadFile_test(int flags) if (hor == 0x0) goto abort; + length = sizeof(buffer); + res = InternetQueryOptionA(hor, INTERNET_OPTION_URL, buffer, &length); + ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); + ok(!strcmp(buffer, "http://www.winehq.org/about/"), "Wrong URL %s\n", buffer); + CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); todo_wine { @@ -366,10 +372,10 @@ static void InternetReadFile_test(int flags) buffer[length]=0; trace("Option 0x16 -> %i %s\n",rc,buffer); - length = 4000; - rc = InternetQueryOptionA(hor,INTERNET_OPTION_URL,buffer,&length); - buffer[length]=0; - trace("Option 0x22 -> %i %s\n",rc,buffer); + length = sizeof(buffer); + res = InternetQueryOptionA(hor, INTERNET_OPTION_URL, buffer, &length); + ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); + ok(!strcmp(buffer, "http://www.winehq.org/site/about"), "Wrong URL %s\n", buffer); length = 16; rc = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_LENGTH,&buffer,&length,0x0); @@ -967,6 +973,103 @@ done: ok(InternetCloseHandle(session), "Close session handle failed\n"); } +static void test_http_cache(void) +{ + HINTERNET session, connect, request; + char file_name[MAX_PATH], url[INTERNET_MAX_URL_LENGTH]; + DWORD size, file_size; + BYTE buf[100]; + HANDLE file; + BOOL ret; + + static const char *types[] = { "*", "", NULL }; + + session = InternetOpenA("Wine Regression Test", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + ok(session != NULL ,"Unable to open Internet session\n"); + + connect = InternetConnectA(session, "www.winehq.org", INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, + INTERNET_SERVICE_HTTP, 0, 0); + ok(connect != NULL, "Unable to connect to http://winehq.org with error %d\n", GetLastError()); + + request = HttpOpenRequestA(connect, NULL, "/site/about", NULL, NULL, types, INTERNET_FLAG_NEED_FILE, 0); + if (!request && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) + { + trace( "Network unreachable, skipping test\n" ); + + ok(InternetCloseHandle(connect), "Close connect handle failed\n"); + ok(InternetCloseHandle(session), "Close session handle failed\n"); + + return; + } + ok(request != NULL, "Failed to open request handle err %u\n", GetLastError()); + + size = sizeof(url); + ret = InternetQueryOptionA(request, INTERNET_OPTION_URL, url, &size); + ok(ret, "InternetQueryOptionA(INTERNET_OPTION_url) failed: %u\n", GetLastError()); + ok(!strcmp(url, "http://www.winehq.org/site/about"), "Wrong URL %s\n", url); + + size = sizeof(file_name); + ret = InternetQueryOptionA(request, INTERNET_OPTION_DATAFILE_NAME, file_name, &size); + ok(!ret, "InternetQueryOptionA(INTERNET_OPTION_DATAFILE_NAME) succeeded\n"); + ok(GetLastError() == ERROR_INTERNET_ITEM_NOT_FOUND, "GetLastError()=%u\n", GetLastError()); + ok(!size, "size = %d\n", size); + + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + + size = sizeof(file_name); + ret = InternetQueryOptionA(request, INTERNET_OPTION_DATAFILE_NAME, file_name, &size); + ok(ret, "InternetQueryOptionA(INTERNET_OPTION_DATAFILE_NAME) failed: %u\n", GetLastError()); + + file = CreateFile(file_name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); + file_size = GetFileSize(file, NULL); + ok(file_size == 0, "file size=%d\n", file_size); + + ret = InternetReadFile(request, buf, sizeof(buf), &size); + ok(ret, "InternetReadFile failed: %u\n", GetLastError()); + ok(size == sizeof(buf), "size=%d\n", size); + + file_size = GetFileSize(file, NULL); + ok(file_size == sizeof(buf), "file size=%d\n", file_size); + CloseHandle(file); + + ok(InternetCloseHandle(request), "Close request handle failed\n"); + + file = CreateFile(file_name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file == INVALID_HANDLE_VALUE, "CreateFile succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError()=%u, expected ERROR_FILE_NOT_FOUND\n", GetLastError()); + + request = HttpOpenRequestA(connect, NULL, "/", NULL, NULL, types, INTERNET_FLAG_NO_CACHE_WRITE, 0); + ok(request != NULL, "Failed to open request handle err %u\n", GetLastError()); + + ret = InternetQueryOptionA(request, INTERNET_OPTION_DATAFILE_NAME, file_name, &size); + ok(!ret, "InternetQueryOptionA(INTERNET_OPTION_DATAFILE_NAME) succeeded\n"); + ok(GetLastError() == ERROR_INTERNET_ITEM_NOT_FOUND, "GetLastError()=%u\n", GetLastError()); + ok(!size, "size = %d\n", size); + + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + + size = sizeof(file_name); + ret = InternetQueryOptionA(request, INTERNET_OPTION_DATAFILE_NAME, file_name, &size); + ok(!ret, "InternetQueryOptionA(INTERNET_OPTION_DATAFILE_NAME) succeeded\n"); + ok(GetLastError() == ERROR_INTERNET_ITEM_NOT_FOUND, "GetLastError()=%u\n", GetLastError()); + ok(!size, "size = %d\n", size); + + file = CreateFile(file_name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file == INVALID_HANDLE_VALUE, "CreateFile succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError()=%u, expected ERROR_FILE_NOT_FOUND\n", GetLastError()); + + ok(InternetCloseHandle(request), "Close request handle failed\n"); + + ok(InternetCloseHandle(connect), "Close connect handle failed\n"); + ok(InternetCloseHandle(session), "Close session handle failed\n"); +} + static void HttpHeaders_test(void) { HINTERNET hSession; @@ -1628,6 +1731,7 @@ START_TEST(http) InternetReadFileExA_test(INTERNET_FLAG_ASYNC); } InternetOpenRequest_test(); + test_http_cache(); InternetOpenUrlA_test(); if (!pInternetTimeFromSystemTimeA) skip("skipping the InternetTime tests\n");

1 0

Jacek Caban : wininet: Code clean up.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: f979134270565231acf3cba42fe75420f4678677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f979134270565231acf3cba42… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 13 13:34:05 2008 +0100 wininet: Code clean up. --- dlls/wininet/http.c | 36 ++++++++++++------------------------ dlls/wininet/urlcache.c | 3 +-- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d718eea..0245d2b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -71,6 +71,7 @@ static const WCHAR szAuthorization[] = { 'A','u','t','h','o','r','i','z','a','t' static const WCHAR szProxy_Authorization[] = { 'P','r','o','x','y','-','A','u','t','h','o','r','i','z','a','t','i','o','n',0 }; static const WCHAR szStatus[] = { 'S','t','a','t','u','s',0 }; static const WCHAR szKeepAlive[] = {'K','e','e','p','-','A','l','i','v','e',0}; +static const WCHAR szGET[] = { 'G','E','T', 0 }; #define MAXHOSTNAME 100 #define MAX_FIELD_VALUE_LEN 256 @@ -210,16 +211,6 @@ static void AsyncHttpSendRequestProc(WORKREQUEST *workRequest) HeapFree(GetProcessHeap(), 0, req->lpszHeader); } -static void HTTP_FixVerb( LPWININETHTTPREQW lpwhr ) -{ - /* if the verb is NULL default to GET */ - if (NULL == lpwhr->lpszVerb) - { - static const WCHAR szGET[] = { 'G','E','T', 0 }; - lpwhr->lpszVerb = WININET_strdupW(szGET); - } -} - static void HTTP_FixURL( LPWININETHTTPREQW lpwhr) { static const WCHAR szSlash[] = { '/',0 }; @@ -871,10 +862,9 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, dwBufferSize=sizeof(szNewLocation); if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL)) { - static const WCHAR szGET[] = { 'G','E','T', 0 }; /* redirects are always GETs */ HeapFree(GetProcessHeap(),0,lpwhr->lpszVerb); - lpwhr->lpszVerb = WININET_strdupW(szGET); + lpwhr->lpszVerb = WININET_strdupW(szGET); HTTP_DrainContent(lpwhr); rc = HTTP_HandleRedirect(lpwhr, szNewLocation); if (rc) @@ -1379,7 +1369,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, goto lend; } - if (NULL != lpszObjectName && strlenW(lpszObjectName)) { + if (lpszObjectName && *lpszObjectName) { HRESULT rc; len = 0; @@ -1396,7 +1386,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, } } - if (NULL != lpszReferrer && strlenW(lpszReferrer)) + if (lpszReferrer && *lpszReferrer) HTTP_ProcessHeader(lpwhr, HTTP_REFERER, lpszReferrer, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); if (lpszAcceptTypes) @@ -1412,13 +1402,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, } } - if (NULL == lpszVerb) - { - static const WCHAR szGet[] = {'G','E','T',0}; - lpwhr->lpszVerb = WININET_strdupW(szGet); - } - else if (strlenW(lpszVerb)) - lpwhr->lpszVerb = WININET_strdupW(lpszVerb); + lpwhr->lpszVerb = WININET_strdupW(lpszVerb && *lpszVerb ? lpszVerb : szGET); HTTP_ProcessHeader(lpwhr, szHost, lpwhs->lpszHostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); @@ -2394,6 +2378,7 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) HeapFree(GetProcessHeap(), 0, combined_url); return FALSE; } + HeapFree(GetProcessHeap(), 0, combined_url); if (!strncmpW(szHttp, urlComponents.lpszScheme, strlenW(szHttp)) && @@ -2430,7 +2415,7 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) */ /* consider the current host as the referrer */ - if (NULL != lpwhs->lpszServerName && strlenW(lpwhs->lpszServerName)) + if (lpwhs->lpszServerName && *lpwhs->lpszServerName) HTTP_ProcessHeader(lpwhr, HTTP_REFERER, lpwhs->lpszServerName, HTTP_ADDHDR_FLAG_REQ|HTTP_ADDREQ_FLAG_REPLACE| HTTP_ADDHDR_FLAG_ADD_IF_NEW); @@ -2472,7 +2457,7 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) HeapFree(GetProcessHeap(), 0, lpwhr->lpszPath); lpwhr->lpszPath=NULL; - if (strlenW(path)) + if (*path) { DWORD needed = 0; HRESULT rc; @@ -2591,7 +2576,10 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, /* Clear any error information */ INTERNET_SetLastError(0); - HTTP_FixVerb(lpwhr); + /* if the verb is NULL default to GET */ + if (!lpwhr->lpszVerb) + lpwhr->lpszVerb = WININET_strdupW(szGET); + if (dwContentLength || !strcmpW(lpwhr->lpszVerb, szPost)) { sprintfW(contentLengthStr, szContentLength, dwContentLength); diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index dc92aff..06dfd85 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1974,8 +1974,7 @@ BOOL WINAPI CreateUrlCacheEntryW( return FALSE; } - for (lpszUrlEnd = lpszUrlName; *lpszUrlEnd; lpszUrlEnd++) - ; + lpszUrlEnd = lpszUrlName + strlenW(lpszUrlName); if (((lpszUrlEnd - lpszUrlName) > 1) && (*(lpszUrlEnd - 1) == '/' || *(lpszUrlEnd - 1) == '\\')) lpszUrlEnd--;

1 0