January 2013 - Wine-Commits

Jacek Caban : wininet: Moved WORKREQ_HTTPSENDREQUESTW out of WORKREQUEST.
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: 940a67c8a59ea786eff26df103fa415e85b0df22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=940a67c8a59ea786eff26df10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 28 11:23:19 2013 +0100 wininet: Moved WORKREQ_HTTPSENDREQUESTW out of WORKREQUEST. --- dlls/wininet/http.c | 82 ++++++++++++++++++++++++----------------------- dlls/wininet/internet.h | 11 ------ 2 files changed, 42 insertions(+), 51 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d00bd6d..a3ca123 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4930,23 +4930,32 @@ lend: return res; } +typedef struct { + task_header_t hdr; + WCHAR *headers; + DWORD headers_len; + void *optional; + DWORD optional_len; + DWORD content_len; + BOOL end_request; +} send_request_task_t; + /*********************************************************************** * * Helper functions for the HttpSendRequest(Ex) functions * */ -static void AsyncHttpSendRequestProc(WORKREQUEST *workRequest) +static void AsyncHttpSendRequestProc(task_header_t *hdr) { - struct WORKREQ_HTTPSENDREQUESTW const *req = &workRequest->u.HttpSendRequestW; - http_request_t *request = (http_request_t*) workRequest->hdr; + send_request_task_t *task = (send_request_task_t*)hdr; + http_request_t *request = (http_request_t*)task->hdr.hdr; TRACE("%p\n", request); - HTTP_HttpSendRequestW(request, req->lpszHeader, - req->dwHeaderLength, req->lpOptional, req->dwOptionalLength, - req->dwContentLength, req->bEndRequest); + HTTP_HttpSendRequestW(request, task->headers, task->headers_len, task->optional, + task->optional_len, task->content_len, task->end_request); - heap_free(req->lpszHeader); + heap_free(task->headers); } @@ -5211,11 +5220,9 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET hRequest, if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; - struct WORKREQ_HTTPSENDREQUESTW *req; + send_request_task_t *task; task = alloc_async_task(&request->hdr, AsyncHttpSendRequestProc, sizeof(*task)); - req = &task->u.HttpSendRequestW; if (lpBuffersIn) { DWORD size = 0; @@ -5227,31 +5234,28 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET hRequest, else size = lpBuffersIn->dwHeadersLength * sizeof(WCHAR); - req->lpszHeader = heap_alloc(size); - memcpy( req->lpszHeader, lpBuffersIn->lpcszHeader, size ); + task->headers = heap_alloc(size); + memcpy(task->headers, lpBuffersIn->lpcszHeader, size); } - else req->lpszHeader = NULL; + else task->headers = NULL; - req->dwHeaderLength = size / sizeof(WCHAR); - req->lpOptional = lpBuffersIn->lpvBuffer; - req->dwOptionalLength = lpBuffersIn->dwBufferLength; - req->dwContentLength = lpBuffersIn->dwBufferTotal; + task->headers_len = size / sizeof(WCHAR); + task->optional = lpBuffersIn->lpvBuffer; + task->optional_len = lpBuffersIn->dwBufferLength; + task->content_len = lpBuffersIn->dwBufferTotal; } else { - req->lpszHeader = NULL; - req->dwHeaderLength = 0; - req->lpOptional = NULL; - req->dwOptionalLength = 0; - req->dwContentLength = 0; + task->headers = NULL; + task->headers_len = 0; + task->optional = NULL; + task->optional_len = 0; + task->content_len = 0; } - req->bEndRequest = FALSE; + task->end_request = FALSE; - INTERNET_AsyncCall(task); - /* - * This is from windows. - */ + INTERNET_AsyncCall(&task->hdr); res = ERROR_IO_PENDING; } else @@ -5317,11 +5321,9 @@ BOOL WINAPI HttpSendRequestW(HINTERNET hHttpRequest, LPCWSTR lpszHeaders, if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - WORKREQUEST *task; - struct WORKREQ_HTTPSENDREQUESTW *req; + send_request_task_t *task; task = alloc_async_task(&request->hdr, AsyncHttpSendRequestProc, sizeof(*task)); - req = &task->u.HttpSendRequestW; if (lpszHeaders) { DWORD size; @@ -5329,18 +5331,18 @@ BOOL WINAPI HttpSendRequestW(HINTERNET hHttpRequest, LPCWSTR lpszHeaders, if (dwHeaderLength == ~0u) size = (strlenW(lpszHeaders) + 1) * sizeof(WCHAR); else size = dwHeaderLength * sizeof(WCHAR); - req->lpszHeader = heap_alloc(size); - memcpy(req->lpszHeader, lpszHeaders, size); + task->headers = heap_alloc(size); + memcpy(task->headers, lpszHeaders, size); } else - req->lpszHeader = 0; - req->dwHeaderLength = dwHeaderLength; - req->lpOptional = lpOptional; - req->dwOptionalLength = dwOptionalLength; - req->dwContentLength = dwOptionalLength; - req->bEndRequest = TRUE; - - INTERNET_AsyncCall(task); + task->headers = NULL; + task->headers_len = dwHeaderLength; + task->optional = lpOptional; + task->optional_len = dwOptionalLength; + task->content_len = dwOptionalLength; + task->end_request = TRUE; + + INTERNET_AsyncCall(&task->hdr); res = ERROR_IO_PENDING; } else diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 5f25f0f..9e66dad 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -427,16 +427,6 @@ struct WORKREQ_FTPFINDNEXTW LPWIN32_FIND_DATAW lpFindFileData; }; -struct WORKREQ_HTTPSENDREQUESTW -{ - LPWSTR lpszHeader; - DWORD dwHeaderLength; - LPVOID lpOptional; - DWORD dwOptionalLength; - DWORD dwContentLength; - BOOL bEndRequest; -}; - struct WORKREQ_HTTPENDREQUESTW { DWORD dwFlags; @@ -488,7 +478,6 @@ typedef struct WORKREQ struct WORKREQ_FTPREMOVEDIRECTORYW FtpRemoveDirectoryW; struct WORKREQ_FTPRENAMEFILEW FtpRenameFileW; struct WORKREQ_FTPFINDNEXTW FtpFindNextW; - struct WORKREQ_HTTPSENDREQUESTW HttpSendRequestW; struct WORKREQ_HTTPENDREQUESTW HttpEndRequestW; struct WORKREQ_SENDCALLBACK SendCallback; struct WORKREQ_INTERNETOPENURLW InternetOpenUrlW;

1 0

Piotr Caban : msvcrt: Don't call invalid parameter handler in str{n, i}cmp functions.
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: 6382bc521952cc5829b9b77e319984072ad17d33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6382bc521952cc5829b9b77e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 28 11:40:36 2013 +0100 msvcrt: Don't call invalid parameter handler in str{n,i}cmp functions. --- dlls/msvcrt/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index d9ec353..e4e94ff 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1567,7 +1567,7 @@ int __cdecl MSVCRT__strnicmp_l(const char *s1, const char *s2, MSVCRT_pthreadlocinfo locinfo; char c1, c2; - if(!MSVCRT_CHECK_PMT(s1!=NULL && s2!=NULL)) + if(s1==NULL || s2==NULL) return MSVCRT__NLSCMPERROR; if(!count)

1 0

Alexandre Julliard : ntdll: Use the monotonic counter for NtGetTickCount.
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: 34a1426fc3e75f87a772ab52a12b3209ab2da70a URL: http://source.winehq.org/git/wine.git/?a=commit;h=34a1426fc3e75f87a772ab52a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 25 17:28:28 2013 +0100 ntdll: Use the monotonic counter for NtGetTickCount. --- dlls/ntdll/time.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index d3f4dab..2b810d4 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -492,10 +492,7 @@ NTSTATUS WINAPI NtQueryPerformanceCounter( LARGE_INTEGER *counter, LARGE_INTEGER */ ULONG WINAPI NtGetTickCount(void) { - LARGE_INTEGER now; - - NtQuerySystemTime( &now ); - return (now.QuadPart - server_start_time) / 10000; + return monotonic_counter() / TICKSPERMSEC; } /* calculate the mday of dst change date, so that for instance Sun 5 Oct 2007

1 0

Detlef Riekenberg : wininet: Remove most GetLastError tests for IsDomainLegalCookieDomainW.
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: 2a66b25e6d97afeffe9a7fb3fbcd106a252f829e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a66b25e6d97afeffe9a7fb3f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jan 25 14:26:20 2013 +0100 wininet: Remove most GetLastError tests for IsDomainLegalCookieDomainW. --- dlls/wininet/tests/internet.c | 50 +---------------------------------------- 1 files changed, 1 insertions(+), 49 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index e9e2239..3dc2233 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -878,7 +878,6 @@ static void InternetTimeToSystemTimeW_test(void) static void test_IsDomainLegalCookieDomainW(void) { BOOL ret; - DWORD error; static const WCHAR empty[] = {0}; static const WCHAR dot[] = {'.',0}; static const WCHAR uk[] = {'u','k',0}; @@ -895,8 +894,7 @@ static void test_IsDomainLegalCookieDomainW(void) SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(NULL, NULL); - error = GetLastError(); - if (!ret && error == ERROR_CALL_NOT_IMPLEMENTED) + if (!ret && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { win_skip("IsDomainLegalCookieDomainW is not implemented\n"); return; @@ -904,82 +902,46 @@ static void test_IsDomainLegalCookieDomainW(void) ok(!ret || broken(ret), /* IE6 */ "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(com, NULL); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(NULL, gmail_com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(empty, gmail_com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME || - broken(error == ERROR_INVALID_PARAMETER), /* IE6 */ - "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(com, empty); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME || - broken(error == ERROR_INVALID_PARAMETER), /* IE6 */ - "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(gmail_com, dot); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME || - broken(error == 0xdeadbeef), /* IE6 */ - "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(dot, gmail_com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME || - broken(error == 0xdeadbeef), /* IE6 */ - "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(com, com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == 0xdeadbeef, "got %u expected 0xdeadbeef\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(com, dot_com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME || - broken(error == 0xdeadbeef), /* IE6 */ - "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(dot_com, com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME || - broken(error == 0xdeadbeef), /* IE6 */ - "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(com, gmail_com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_SXS_KEY_NOT_FOUND || - error == ERROR_SUCCESS || /* IE8 on W2K3 */ - error == 0xdeadbeef, /* up to IE7 */ - "unexpected error: %u\n", error); ret = pIsDomainLegalCookieDomainW(gmail_com, gmail_com); ok(ret, "IsDomainLegalCookieDomainW failed\n"); @@ -992,13 +954,7 @@ static void test_IsDomainLegalCookieDomainW(void) SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(gmail_co_uk, co_uk); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_SXS_KEY_NOT_FOUND || /* IE8 on XP */ - error == ERROR_FILE_NOT_FOUND || /* IE8 on Vista */ - error == ERROR_SUCCESS || /* IE8 on W2K3 */ - error == 0xdeadbeef, /* up to IE7 */ - "unexpected error: %u\n", error); ret = pIsDomainLegalCookieDomainW(uk, co_uk); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); @@ -1017,11 +973,7 @@ static void test_IsDomainLegalCookieDomainW(void) SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(dot_gmail_com, mail_gmail_com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME || - broken(error == 0xdeadbeef), /* IE6 */ - "got %u expected ERROR_INVALID_NAME\n", error); ret = pIsDomainLegalCookieDomainW(gmail_com, mail_gmail_com); ok(ret, "IsDomainLegalCookieDomainW failed\n");

1 0

Andrew Eikum : wineoss.drv: Set reasonable defaults if driver reports invalid values.
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: 6da3ce276bd76a5242c8340c50042c95ea74a787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6da3ce276bd76a5242c8340c5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 28 08:52:55 2013 -0600 wineoss.drv: Set reasonable defaults if driver reports invalid values. --- dlls/wineoss.drv/mmdevdrv.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index ea6d452..2c81404 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1307,8 +1307,19 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, return E_FAIL; } - fmt->Format.nChannels = This->ai.max_channels; - fmt->Format.nSamplesPerSec = This->ai.max_rate; + /* some OSS drivers are buggy, so set reasonable defaults if + * the reported values seem wacky */ + fmt->Format.nChannels = max(This->ai.max_channels, This->ai.min_channels); + if(fmt->Format.nChannels == 0 || fmt->Format.nChannels > 8) + fmt->Format.nChannels = 2; + + if(This->ai.max_rate == 0) + fmt->Format.nSamplesPerSec = 44100; + else + fmt->Format.nSamplesPerSec = min(This->ai.max_rate, 44100); + if(fmt->Format.nSamplesPerSec < This->ai.min_rate) + fmt->Format.nSamplesPerSec = This->ai.min_rate; + fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels); fmt->Format.nBlockAlign = (fmt->Format.wBitsPerSample *

1 0

Henri Verbeet : wined3d: Get rid of CheckBumpMapCapability().
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: c9ca9c5a7ef8949748c7e1ae7f22cabda48f5245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ca9c5a7ef8949748c7e1ae7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 28 11:15:40 2013 +0100 wined3d: Get rid of CheckBumpMapCapability(). The color fixup being supported is implied by WINED3DFMT_FLAG_TEXTURE. --- dlls/wined3d/directx.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4c38511..d9e2607 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3429,16 +3429,6 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 return WINED3D_OK; } -/* Check if we support bumpmapping for a format */ -static BOOL CheckBumpMapCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) -{ - /* Ask the fixed function pipeline implementation if it can deal - * with the conversion. If we've got a GL extension giving native - * support this will be an identity conversion. */ - return (format->flags & WINED3DFMT_FLAG_BUMPMAP) - && adapter->fragment_pipe->color_fixup_supported(format->color_fixup); -} - /* Check if the given DisplayFormat + DepthStencilFormat combination is valid for the Adapter */ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *display_format, const struct wined3d_format *ds_format) @@ -3831,7 +3821,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_LEGACYBUMPMAP) { - if (!CheckBumpMapCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_BUMPMAP)) { TRACE("[FAILED] - No legacy bumpmap support.\n"); return WINED3DERR_NOTAVAILABLE;

1 0

Henri Verbeet : wined3d: Get rid of CheckTextureCapability().
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: 4cdb03a76e0829f3928b1c3835f91b9949d75070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cdb03a76e0829f3928b1c383… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 28 11:15:39 2013 +0100 wined3d: Get rid of CheckTextureCapability(). --- dlls/wined3d/directx.c | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 868e3a4..4c38511 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3526,12 +3526,6 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, return FALSE; } -/* Check if a texture format is supported on the given adapter */ -static BOOL CheckTextureCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) -{ - return format->flags & WINED3DFMT_FLAG_TEXTURE; -} - static BOOL CheckSurfaceCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *adapter_format, const struct wined3d_format *check_format, BOOL no3d) @@ -3568,8 +3562,10 @@ static BOOL CheckSurfaceCapability(const struct wined3d_adapter *adapter, } } - /* All format that are supported for textures are supported for surfaces as well */ - if (CheckTextureCapability(adapter, check_format)) return TRUE; + /* All formats that are supported for textures are supported for surfaces + * as well. */ + if (check_format->flags & WINED3DFMT_FLAG_TEXTURE) + return TRUE; /* All depth stencil formats are supported on surfaces */ if (CheckDepthStencilCapability(adapter, adapter_format, check_format)) return TRUE; @@ -3630,7 +3626,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad return WINED3DERR_NOTAVAILABLE; } - if (!CheckTextureCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_TEXTURE)) { TRACE("[FAILED] - Cube texture format not supported.\n"); return WINED3DERR_NOTAVAILABLE; @@ -3789,7 +3785,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad return WINED3DERR_NOTAVAILABLE; } - if (!CheckTextureCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_TEXTURE)) { TRACE("[FAILED] - Texture format not supported.\n"); return WINED3DERR_NOTAVAILABLE; @@ -3926,7 +3922,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad return WINED3DERR_NOTAVAILABLE; } - if (!CheckTextureCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_TEXTURE)) { TRACE("[FAILED] - Format not supported.\n"); return WINED3DERR_NOTAVAILABLE;

1 0

Detlef Riekenberg : wininet: Don't depend on user settings.
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: 097dee606eb02acee7421c3ab35f2fa57e036fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=097dee606eb02acee7421c3ab… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jan 25 17:23:49 2013 +0100 wininet: Don't depend on user settings. --- dlls/wininet/tests/internet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 3dc2233..bf5723c 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -319,14 +319,14 @@ static void test_max_conns(void) res = InternetQueryOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, &len); ok(res,"Got wrong return value %x\n", res); ok(len == sizeof(val), "got %d\n", len); - ok(val == 2, "got %d\n", val); + trace("INTERNET_OPTION_MAX_CONNS_PER_SERVER: %d\n", val); len = sizeof(val); val = 0xdeadbeef; res = InternetQueryOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER, &val, &len); ok(res,"Got wrong return value %x\n", res); ok(len == sizeof(val), "got %d\n", len); - ok(val == 4, "got %d\n", val); + trace("INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER: %d\n", val); val = 3; res = InternetSetOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, sizeof(val));

1 0

Detlef Riekenberg : wininet: Fix a test failure on w2k.
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: e1c2f18ab10d0e7c2852bc1c762fc3fa2e60832a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c2f18ab10d0e7c2852bc1c7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jan 25 14:26:18 2013 +0100 wininet: Fix a test failure on w2k. --- dlls/wininet/tests/internet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 15a600c..e9e2239 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -436,7 +436,7 @@ static void test_complicated_cookie(void) memset(wbuf, 0xac, sizeof(wbuf)); ret = InternetGetCookieW(testing_example_comW, NULL, wbuf, &len); ok(ret == TRUE,"InternetGetCookieW failed\n"); - ok(len == 19, "len = %u\n", len); + ok(len == 19 || broken(len==18), "len = %u\n", len); ok(lstrlenW(wbuf) == 18, "strlenW(wbuf) = %u\n", lstrlenW(wbuf)); len = 10;

1 0

Alexandre Julliard : ntdll: Add support for the monotonic time counter on Mac OS X.
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: 04e14c7b46df95bf2a80ad04d497d3d927649afd URL: http://source.winehq.org/git/wine.git/?a=commit;h=04e14c7b46df95bf2a80ad04d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 28 17:11:25 2013 +0100 ntdll: Add support for the monotonic time counter on Mac OS X. --- dlls/ntdll/time.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index b9d3f03..d3f4dab 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -38,6 +38,9 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif +#ifdef __APPLE__ +# include <mach/mach_time.h> +#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -111,6 +114,11 @@ static ULONGLONG monotonic_counter(void) #endif if (!clock_gettime( CLOCK_MONOTONIC, &ts )) return ts.tv_sec * (ULONGLONG)TICKSPERSEC + ts.tv_nsec / 100; +#elif defined(__APPLE__) + static mach_timebase_info_data_t timebase; + + if (!timebase.denom) mach_timebase_info( &timebase ); + return mach_absolute_time() * timebase.numer / timebase.denom / 100; #endif gettimeofday( &now, 0 );

1 0