May 2007 - Wine-commits - list.winehq.org

Rob Shearman : wininet: Add a new NETCON_query_data_available function.
by Alexandre Julliard 29 May '07

29 May '07

Module: wine Branch: master Commit: 56267608f1a5c1a582e3faffd1b717d08abfbd9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=56267608f1a5c1a582e3faffd… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon May 28 11:16:06 2007 +0100 wininet: Add a new NETCON_query_data_available function. Use it to implement the behaviour where InternetReadFileExA does a synchronous request if the data is available and asynchronous otherwise. --- dlls/wininet/internet.c | 49 +++++++++++++++++++++++++++-------------- dlls/wininet/internet.h | 1 + dlls/wininet/netconnection.c | 32 +++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 4d48089..305392a 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1855,26 +1855,32 @@ BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOu return FALSE; } - /* FIXME: native only does it asynchronously if the amount of data - * requested isn't available. See NtReadFile. */ /* FIXME: IRF_ASYNC may not be the right thing to test here; - * hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC is probably better, but - * we should implement the above first */ + * hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC is probably better */ if (dwFlags & IRF_ASYNC) { - WORKREQUEST workRequest; - struct WORKREQ_INTERNETREADFILEEXA *req; + DWORD dwDataAvailable = 0; + + if (lpwh->htype == WH_HHTTPREQ) + NETCON_query_data_available(&((LPWININETHTTPREQW)lpwh)->netConnection, + &dwDataAvailable); - workRequest.asyncproc = AsyncInternetReadFileExProc; - workRequest.hdr = WININET_AddRef( lpwh ); - req = &workRequest.u.InternetReadFileExA; - req->lpBuffersOut = lpBuffersOut; + if (!dwDataAvailable) + { + WORKREQUEST workRequest; + struct WORKREQ_INTERNETREADFILEEXA *req; - retval = INTERNET_AsyncCall(&workRequest); - if (!retval) return FALSE; + workRequest.asyncproc = AsyncInternetReadFileExProc; + workRequest.hdr = WININET_AddRef( lpwh ); + req = &workRequest.u.InternetReadFileExA; + req->lpBuffersOut = lpBuffersOut; - INTERNET_SetLastError(ERROR_IO_PENDING); - return FALSE; + retval = INTERNET_AsyncCall(&workRequest); + if (!retval) return FALSE; + + INTERNET_SetLastError(ERROR_IO_PENDING); + return FALSE; + } } retval = INTERNET_ReadFile(lpwh, lpBuffersOut->lpvBuffer, @@ -3258,15 +3264,24 @@ BOOL WINAPI InternetQueryDataAvailable( HINTERNET hFile, switch (lpwhr->hdr.htype) { case WH_HHTTPREQ: - if (!NETCON_recv(&lpwhr->netConnection, buffer, + if (NETCON_query_data_available(&lpwhr->netConnection, + lpdwNumberOfBytesAvailble)) + { + if (!*lpdwNumberOfBytesAvailble && + !NETCON_recv(&lpwhr->netConnection, buffer, min(sizeof(buffer), lpwhr->dwContentLength - lpwhr->dwContentRead), MSG_PEEK, (int *)lpdwNumberOfBytesAvailble)) + { + INTERNET_SetLastError(ERROR_NO_MORE_FILES); + retval = FALSE; + } + retval = TRUE; + } + else { INTERNET_SetLastError(ERROR_NO_MORE_FILES); retval = FALSE; } - else - retval = TRUE; break; default: diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index c1476de..4bb7a88 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -459,6 +459,7 @@ BOOL NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len, int *sent /* out */); BOOL NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int flags, int *recvd /* out */); +BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *available); BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPDWORD dwBuffer); LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection); BOOL NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index ec2b18d..125a90b 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -33,6 +33,9 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif #include <stdarg.h> #include <stdlib.h> #include <string.h> @@ -570,6 +573,35 @@ BOOL NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int f } /****************************************************************************** + * NETCON_query_data_available + * Returns the number of bytes of peeked data plus the number of bytes of + * queued, but unread data. + */ +BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *available) +{ + if (!NETCON_connected(connection)) + return FALSE; + + if (connection->peek_msg) + *available = connection->peek_len; + else + *available = 0; +#ifdef FIONREAD + if (!connection->useSSL) + { + int unread; + int retval = ioctl(connection->socketFD, FIONREAD, &unread); + if (!retval) + { + TRACE("%d bytes of queued, but unread data\n", unread); + *available += unread; + } + } +#endif + return TRUE; +} + +/****************************************************************************** * NETCON_getNextLine */ BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPDWORD dwBuffer)

1 0

Jacek Caban : urlmon: There is no need to make slash conversion in BindToStorage as URL is already canonized in the constructor .
by Alexandre Julliard 29 May '07

29 May '07

Module: wine Branch: master Commit: 172a35c442c77e5b101be1e82102446873481d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=172a35c442c77e5b101be1e82… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 29 03:41:12 2007 +0200 urlmon: There is no need to make slash conversion in BindToStorage as URL is already canonized in the constructor. --- dlls/urlmon/umon.c | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 5c795f0..b8c6bfe 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -549,7 +549,6 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, bindf = 0; hres = IBindStatusCallback_GetBindInfo(bind->pbscb, &bindf, &bi); if(SUCCEEDED(hres)) { - WCHAR *urlcopy, *tmpwc; URL_COMPONENTSW url; WCHAR *host, *path, *user, *pass; DWORD lensz = sizeof(bind->expected_size); @@ -561,24 +560,13 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, hres = IBindStatusCallback_OnStartBinding(bind->pbscb, 0, (IBinding*)bind); TRACE("OnStartBinding rets %08x\n", hres); - /* This class will accept URLs with the backslash in them. But InternetCrackURL will not - it - * requires forward slashes (this is the behaviour of Microsoft's INETAPI). So we need to make - * a copy of the URL here and change the backslash to a forward slash everywhere it appears - - * but only before any '#' or '?', after which backslash should be left alone. - */ - urlcopy = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * (lstrlenW(bind->URLName) + 1)); - lstrcpyW(urlcopy, bind->URLName); - for (tmpwc = urlcopy; *tmpwc && *tmpwc != '#' && *tmpwc != '?'; ++tmpwc) - if (*tmpwc == '\\') - *tmpwc = '/'; - bind->expected_size = 0; bind->total_read = 0; memset(&url, 0, sizeof(url)); url.dwStructSize = sizeof(url); url.dwSchemeLength = url.dwHostNameLength = url.dwUrlPathLength = url.dwUserNameLength = url.dwPasswordLength = 1; - InternetCrackUrlW(urlcopy, 0, ICU_ESCAPE, &url); + InternetCrackUrlW(URLName, 0, ICU_ESCAPE, &url); host = HeapAlloc(GetProcessHeap(), 0, (url.dwHostNameLength + 1) * sizeof(WCHAR)); memcpy(host, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR)); host[url.dwHostNameLength] = '\0'; @@ -739,7 +727,6 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, HeapFree(GetProcessHeap(), 0, pass); HeapFree(GetProcessHeap(), 0, path); HeapFree(GetProcessHeap(), 0, host); - HeapFree(GetProcessHeap(), 0, urlcopy); } } }

1 0

Rob Shearman : wininet: Don' t close the connection if the caller passes in zero for the number of bytes to be read .
by Alexandre Julliard 29 May '07

29 May '07

Module: wine Branch: master Commit: 76507d475b59c4efb533dd05d1ab095f834faaba URL: http://source.winehq.org/git/wine.git/?a=commit;h=76507d475b59c4efb533dd05d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon May 28 11:13:36 2007 +0100 wininet: Don't close the connection if the caller passes in zero for the number of bytes to be read. Only close the connection when the bytes read equals the content length. Fixup HTTP_DrainContent, which relied on the previous incorrect behaviour to instead close connections with no content length manually. --- dlls/wininet/http.c | 6 ++++++ dlls/wininet/internet.c | 2 +- dlls/wininet/tests/http.c | 1 + 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c410f92..a48d7ae 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -738,6 +738,12 @@ BOOL WINAPI HttpAddRequestHeadersA(HINTERNET hHttpRequest, static void HTTP_DrainContent(LPWININETHTTPREQW lpwhr) { DWORD bytes_read; + + if (!NETCON_connected(&lpwhr->netConnection)) return; + + if (lpwhr->dwContentLength == -1) + NETCON_close(&lpwhr->netConnection); + do { char buffer[2048]; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 06611c8..4d48089 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1724,7 +1724,7 @@ BOOL INTERNET_ReadFile(LPWININETHANDLEHEADER lpwh, LPVOID lpBuffer, { lpwhr->dwContentRead += bytes_read; *pdwNumOfBytesRead = bytes_read; - if (!bytes_read) + if (!bytes_read && (lpwhr->dwContentRead == lpwhr->dwContentLength)) retval = HTTP_FinishedReading(lpwhr); else retval = TRUE; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 8926968..3cf5841 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -444,6 +444,7 @@ static void InternetReadFileExA_test(int flags) length += inetbuffers.dwBufferLength; } + ok(length > 0, "failed to read any of the document\n"); trace("Finished. Read %d bytes\n", length); abort:

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 29 May '07

29 May '07

Module: wine Branch: master Commit: fa48cb042c9c658d9ba64fec294c23c735674e48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa48cb042c9c658d9ba64fec2… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 28 01:10:17 2007 +0200 Assorted spelling fixes. --- dlls/crypt32/tests/sip.c | 4 ++-- dlls/ddraw/utils.c | 2 +- dlls/msi/tests/automation.c | 2 +- dlls/msxml3/tests/xmlelem.c | 2 +- dlls/oleaut32/tests/vartest.c | 26 +++++++++++++------------- dlls/oleaut32/variant.c | 10 +++++----- dlls/riched20/tests/editor.c | 2 +- 7 files changed, 24 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa48cb042c9c658d9ba64…

1 0

Francois Gouget : dsound/tests: Fix the Visual C++ double to float conversion warnings.
by Alexandre Julliard 29 May '07

29 May '07

Module: wine Branch: master Commit: 24b315c51f1bc84866bb80331fd3c8ded72517e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24b315c51f1bc84866bb80331… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 28 01:20:07 2007 +0200 dsound/tests: Fix the Visual C++ double to float conversion warnings. --- dlls/dsound/tests/ds3d.c | 14 ++++++-------- dlls/dsound/tests/ds3d8.c | 14 ++++++-------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 7790014..54b50e2 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -608,8 +608,8 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, ok(rc==DS_OK,"IDirectSound3dListener_GetAllParameters() " "failed: %s\n",DXGetErrorString8(rc)); if (move_listener) { - listener_param.vPosition.x = -5.0; - listener_param.vVelocity.x = 10.0/duration; + listener_param.vPosition.x = -5.0f; + listener_param.vVelocity.x = (float)(10.0/duration); } rc=IDirectSound3DListener_SetAllParameters(listener, &listener_param, @@ -619,8 +619,8 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, } if (buffer3d) { if (move_sound) { - buffer_param.vPosition.x = 100.0; - buffer_param.vVelocity.x = -200.0/duration; + buffer_param.vPosition.x = 100.0f; + buffer_param.vVelocity.x = (float)(-200.0/duration); } buffer_param.flMinDistance = 10; rc=IDirectSound3DBuffer_SetAllParameters(buffer,&buffer_param, @@ -634,8 +634,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, WaitForSingleObject(GetCurrentProcess(),TIME_SLICE); now=GetTickCount(); if (listener && move_listener) { - listener_param.vPosition.x = -5.0+10.0*(now-start_time)/ - 1000/duration; + listener_param.vPosition.x = (float)(-5.0+10.0*(now-start_time)/1000/duration); if (winetest_debug>2) trace("listener position=%g\n",listener_param.vPosition.x); rc=IDirectSound3DListener_SetPosition(listener, @@ -645,8 +644,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, "%s\n",DXGetErrorString8(rc)); } if (buffer3d && move_sound) { - buffer_param.vPosition.x = 100-200.0*(now-start_time)/ - 1000/duration; + buffer_param.vPosition.x = (float)(100-200.0*(now-start_time)/1000/duration); if (winetest_debug>2) trace("sound position=%g\n",buffer_param.vPosition.x); rc=IDirectSound3DBuffer_SetPosition(buffer, diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 70b7526..00c0ef7 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -485,8 +485,8 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, ok(rc==DS_OK,"IDirectSound3dListener_GetAllParameters() " "failed: %s\n",DXGetErrorString8(rc)); if (move_listener) { - listener_param.vPosition.x = -5.0; - listener_param.vVelocity.x = 10.0/duration; + listener_param.vPosition.x = -5.0f; + listener_param.vVelocity.x = (float)(10.0/duration); } rc=IDirectSound3DListener_SetAllParameters(listener, &listener_param, @@ -496,8 +496,8 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, } if (buffer3d) { if (move_sound) { - buffer_param.vPosition.x = 100.0; - buffer_param.vVelocity.x = -200.0/duration; + buffer_param.vPosition.x = 100.0f; + buffer_param.vVelocity.x = (float)(-200.0/duration); } buffer_param.flMinDistance = 10; rc=IDirectSound3DBuffer_SetAllParameters(buffer,&buffer_param, @@ -511,8 +511,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, WaitForSingleObject(GetCurrentProcess(),TIME_SLICE); now=GetTickCount(); if (listener && move_listener) { - listener_param.vPosition.x = -5.0+10.0*(now-start_time)/ - 1000/duration; + listener_param.vPosition.x = (float)(-5.0+10.0*(now-start_time)/1000/duration); if (winetest_debug>2) trace("listener position=%g\n",listener_param.vPosition.x); rc=IDirectSound3DListener_SetPosition(listener, @@ -522,8 +521,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, "%s\n",DXGetErrorString8(rc)); } if (buffer3d && move_sound) { - buffer_param.vPosition.x = 100-200.0*(now-start_time)/ - 1000/duration; + buffer_param.vPosition.x = (float)(100-200.0*(now-start_time)/1000/duration); if (winetest_debug>2) trace("sound position=%g\n",buffer_param.vPosition.x); rc=IDirectSound3DBuffer_SetPosition(buffer,

1 0

Francois Gouget : oleaut32/tests: Fix the Visual C++ double to float conversion warnings.
by Alexandre Julliard 29 May '07

29 May '07

Module: wine Branch: master Commit: ffbf92f5f262a9aa8e84dcdedd4c0aea646b96fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffbf92f5f262a9aa8e84dcded… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 28 01:20:18 2007 +0200 oleaut32/tests: Fix the Visual C++ double to float conversion warnings. --- dlls/oleaut32/tests/vartest.c | 298 ++++++++++++++++++++-------------------- 1 files changed, 149 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffbf92f5f262a9aa8e84d…

1 0

Francois Gouget : d3d8/tests: Fix the Visual C++ double to float conversion warnings.
by Alexandre Julliard 29 May '07

29 May '07

Module: wine Branch: master Commit: f64f30cdba84fd818a21ca43b1e5ae4bcac6ed5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f64f30cdba84fd818a21ca43b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 28 01:19:48 2007 +0200 d3d8/tests: Fix the Visual C++ double to float conversion warnings. --- dlls/d3d8/tests/visual.c | 72 +++++++++++++++++++++++----------------------- 1 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 13df521..f755679 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -143,38 +143,38 @@ static void lighting_test(IDirect3DDevice8 *device) DWORD nfvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_NORMAL; DWORD color; - float mat[16] = { 1.0, 0.0, 0.0, 0.0, - 0.0, 1.0, 0.0, 0.0, - 0.0, 0.0, 1.0, 0.0, - 0.0, 0.0, 0.0, 1.0 }; + float mat[16] = { 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f }; struct vertex unlitquad[] = { - {-1.0, -1.0, 0.1, 0xffff0000}, - {-1.0, 0.0, 0.1, 0xffff0000}, - { 0.0, 0.0, 0.1, 0xffff0000}, - { 0.0, -1.0, 0.1, 0xffff0000}, + {-1.0f, -1.0f, 0.1f, 0xffff0000}, + {-1.0f, 0.0f, 0.1f, 0xffff0000}, + { 0.0f, 0.0f, 0.1f, 0xffff0000}, + { 0.0f, -1.0f, 0.1f, 0xffff0000}, }; struct vertex litquad[] = { - {-1.0, 0.0, 0.1, 0xff00ff00}, - {-1.0, 1.0, 0.1, 0xff00ff00}, - { 0.0, 1.0, 0.1, 0xff00ff00}, - { 0.0, 0.0, 0.1, 0xff00ff00}, + {-1.0f, 0.0f, 0.1f, 0xff00ff00}, + {-1.0f, 1.0f, 0.1f, 0xff00ff00}, + { 0.0f, 1.0f, 0.1f, 0xff00ff00}, + { 0.0f, 0.0f, 0.1f, 0xff00ff00}, }; struct nvertex unlitnquad[] = { - { 0.0, -1.0, 0.1, 1.0, 1.0, 1.0, 0xff0000ff}, - { 0.0, 0.0, 0.1, 1.0, 1.0, 1.0, 0xff0000ff}, - { 1.0, 0.0, 0.1, 1.0, 1.0, 1.0, 0xff0000ff}, - { 1.0, -1.0, 0.1, 1.0, 1.0, 1.0, 0xff0000ff}, + { 0.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, + { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, + { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, + { 1.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, }; struct nvertex litnquad[] = { - { 0.0, 0.0, 0.1, 1.0, 1.0, 1.0, 0xffffff00}, - { 0.0, 1.0, 0.1, 1.0, 1.0, 1.0, 0xffffff00}, - { 1.0, 1.0, 0.1, 1.0, 1.0, 1.0, 0xffffff00}, - { 1.0, 0.0, 0.1, 1.0, 1.0, 1.0, 0xffffff00}, + { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, + { 0.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, + { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, + { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, }; WORD Indices[] = {0, 1, 2, 2, 3, 0}; @@ -327,32 +327,32 @@ static void fog_test(IDirect3DDevice8 *device) /* Gets full z based fog with linear fog, no fog with specular color */ struct sVertex unstransformed_1[] = { - {-1, -1, 0.1, 0xFFFF0000, 0xFF000000 }, - {-1, 0, 0.1, 0xFFFF0000, 0xFF000000 }, - { 0, 0, 0.1, 0xFFFF0000, 0xFF000000 }, - { 0, -1, 0.1, 0xFFFF0000, 0xFF000000 }, + {-1, -1, 0.1f, 0xFFFF0000, 0xFF000000 }, + {-1, 0, 0.1f, 0xFFFF0000, 0xFF000000 }, + { 0, 0, 0.1f, 0xFFFF0000, 0xFF000000 }, + { 0, -1, 0.1f, 0xFFFF0000, 0xFF000000 }, }; /* Ok, I am too lazy to deal with transform matrices */ struct sVertex unstransformed_2[] = { - {-1, 0, 1.0, 0xFFFF0000, 0xFF000000 }, - {-1, 1, 1.0, 0xFFFF0000, 0xFF000000 }, - { 0, 1, 1.0, 0xFFFF0000, 0xFF000000 }, - { 0, 0, 1.0, 0xFFFF0000, 0xFF000000 }, + {-1, 0, 1.0f, 0xFFFF0000, 0xFF000000 }, + {-1, 1, 1.0f, 0xFFFF0000, 0xFF000000 }, + { 0, 1, 1.0f, 0xFFFF0000, 0xFF000000 }, + { 0, 0, 1.0f, 0xFFFF0000, 0xFF000000 }, }; /* Untransformed ones. Give them a different diffuse color to make the test look * nicer. It also makes making sure that they are drawn correctly easier. */ struct sVertexT transformed_1[] = { - {320, 0, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, - {640, 0, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, - {640, 240, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, - {320, 240, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, + {320, 0, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, + {640, 0, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, + {640, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, + {320, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, }; struct sVertexT transformed_2[] = { - {320, 240, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, - {640, 240, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, - {640, 480, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, - {320, 480, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, + {320, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, + {640, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, + {640, 480, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, + {320, 480, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, }; WORD Indices[] = {0, 1, 2, 2, 3, 0};

1 0

Francois Gouget : d3d9/tests: Fix the Visual C++ double to float conversion warnings.
by Alexandre Julliard 29 May '07

29 May '07

Module: wine Branch: master Commit: e6196f9ae7760c8bd7cfabc6747ebcb89bbb7c62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6196f9ae7760c8bd7cfabc67… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 28 01:19:58 2007 +0200 d3d9/tests: Fix the Visual C++ double to float conversion warnings. --- dlls/d3d9/tests/stateblock.c | 58 ++++++++++++++++--------------- dlls/d3d9/tests/visual.c | 78 +++++++++++++++++++++--------------------- 2 files changed, 69 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6196f9ae7760c8bd7cfa…

1 0

Francois Gouget : ddraw/tests: Fix the Visual C++ double to float conversion warnings.
by Alexandre Julliard 29 May '07

29 May '07

Module: wine Branch: master Commit: 30b7744472ea6e61476b08ad654ea3a9164457c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b7744472ea6e61476b08ad6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 28 01:20:03 2007 +0200 ddraw/tests: Fix the Visual C++ double to float conversion warnings. --- dlls/ddraw/tests/visual.c | 72 ++++++++++++++++++++++---------------------- 1 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index e970a9f..dcdcec5 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -195,38 +195,38 @@ static void lighting_test(IDirect3DDevice7 *device) DWORD nfvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_NORMAL; DWORD color; - float mat[16] = { 1.0, 0.0, 0.0, 0.0, - 0.0, 1.0, 0.0, 0.0, - 0.0, 0.0, 1.0, 0.0, - 0.0, 0.0, 0.0, 1.0 }; + float mat[16] = { 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f }; struct vertex unlitquad[] = { - {-1.0, -1.0, 0.1, 0xffff0000}, - {-1.0, 0.0, 0.1, 0xffff0000}, - { 0.0, 0.0, 0.1, 0xffff0000}, - { 0.0, -1.0, 0.1, 0xffff0000}, + {-1.0f, -1.0f, 0.1f, 0xffff0000}, + {-1.0f, 0.0f, 0.1f, 0xffff0000}, + { 0.0f, 0.0f, 0.1f, 0xffff0000}, + { 0.0f, -1.0f, 0.1f, 0xffff0000}, }; struct vertex litquad[] = { - {-1.0, 0.0, 0.1, 0xff00ff00}, - {-1.0, 1.0, 0.1, 0xff00ff00}, - { 0.0, 1.0, 0.1, 0xff00ff00}, - { 0.0, 0.0, 0.1, 0xff00ff00}, + {-1.0f, 0.0f, 0.1f, 0xff00ff00}, + {-1.0f, 1.0f, 0.1f, 0xff00ff00}, + { 0.0f, 1.0f, 0.1f, 0xff00ff00}, + { 0.0f, 0.0f, 0.1f, 0xff00ff00}, }; struct nvertex unlitnquad[] = { - { 0.0, -1.0, 0.1, 1.0, 1.0, 1.0, 0xff0000ff}, - { 0.0, 0.0, 0.1, 1.0, 1.0, 1.0, 0xff0000ff}, - { 1.0, 0.0, 0.1, 1.0, 1.0, 1.0, 0xff0000ff}, - { 1.0, -1.0, 0.1, 1.0, 1.0, 1.0, 0xff0000ff}, + { 0.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, + { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, + { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, + { 1.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, }; struct nvertex litnquad[] = { - { 0.0, 0.0, 0.1, 1.0, 1.0, 1.0, 0xffffff00}, - { 0.0, 1.0, 0.1, 1.0, 1.0, 1.0, 0xffffff00}, - { 1.0, 1.0, 0.1, 1.0, 1.0, 1.0, 0xffffff00}, - { 1.0, 0.0, 0.1, 1.0, 1.0, 1.0, 0xffffff00}, + { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, + { 0.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, + { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, + { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, }; WORD Indices[] = {0, 1, 2, 2, 3, 0}; @@ -367,32 +367,32 @@ static void fog_test(IDirect3DDevice7 *device) /* Gets full z based fog with linear fog, no fog with specular color */ struct sVertex unstransformed_1[] = { - {-1, -1, 0.1, 0xFFFF0000, 0xFF000000 }, - {-1, 0, 0.1, 0xFFFF0000, 0xFF000000 }, - { 0, 0, 0.1, 0xFFFF0000, 0xFF000000 }, - { 0, -1, 0.1, 0xFFFF0000, 0xFF000000 }, + {-1, -1, 0.1f, 0xFFFF0000, 0xFF000000 }, + {-1, 0, 0.1f, 0xFFFF0000, 0xFF000000 }, + { 0, 0, 0.1f, 0xFFFF0000, 0xFF000000 }, + { 0, -1, 0.1f, 0xFFFF0000, 0xFF000000 }, }; /* Ok, I am too lazy to deal with transform matrices */ struct sVertex unstransformed_2[] = { - {-1, 0, 1.0, 0xFFFF0000, 0xFF000000 }, - {-1, 1, 1.0, 0xFFFF0000, 0xFF000000 }, - { 0, 1, 1.0, 0xFFFF0000, 0xFF000000 }, - { 0, 0, 1.0, 0xFFFF0000, 0xFF000000 }, + {-1, 0, 1.0f, 0xFFFF0000, 0xFF000000 }, + {-1, 1, 1.0f, 0xFFFF0000, 0xFF000000 }, + { 0, 1, 1.0f, 0xFFFF0000, 0xFF000000 }, + { 0, 0, 1.0f, 0xFFFF0000, 0xFF000000 }, }; /* Untransformed ones. Give them a different diffuse color to make the test look * nicer. It also makes making sure that they are drawn correctly easier. */ struct sVertexT transformed_1[] = { - {320, 0, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, - {640, 0, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, - {640, 240, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, - {320, 240, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, + {320, 0, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, + {640, 0, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, + {640, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, + {320, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, }; struct sVertexT transformed_2[] = { - {320, 240, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, - {640, 240, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, - {640, 480, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, - {320, 480, 1.0, 1.0, 0xFFFFFF00, 0xFF000000 }, + {320, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, + {640, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, + {640, 480, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, + {320, 480, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, }; WORD Indices[] = {0, 1, 2, 2, 3, 0};

1 0

Francois Gouget : psapi/tests: Fix a signed/unsigned int mismatch.
by Alexandre Julliard 29 May '07

29 May '07

Module: wine Branch: master Commit: 7071a0105f8921055f7ca0cb263791a6d85a9751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7071a0105f8921055f7ca0cb2… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 28 01:17:28 2007 +0200 psapi/tests: Fix a signed/unsigned int mismatch. --- dlls/psapi/tests/psapi_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 76db0de..1978fd4 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -236,7 +236,7 @@ static void test_ws_functions(void) PSAPI_WS_WATCH_INFORMATION wswi[4096]; ULONG_PTR pages[4096]; char *addr; - int i; + unsigned int i; todo_wine w32_err(pEmptyWorkingSet(NULL), ERROR_INVALID_HANDLE); todo_wine w32_err(pEmptyWorkingSet(hpSR), ERROR_ACCESS_DENIED);

1 0