April 2009 - Wine-commits - list.winehq.org

Detlef Riekenberg : wintrust/tests: Do not test GetLastError on success.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: 24340287fd41ff984062f73e271c4da6c5d74ccd URL: http://source.winehq.org/git/wine.git/?a=commit;h=24340287fd41ff984062f73e2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 8 20:01:34 2009 +0200 wintrust/tests: Do not test GetLastError on success. --- dlls/wintrust/tests/crypt.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index cfb9564..acadead 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -206,9 +206,7 @@ static void test_context(void) /* Proper release */ SetLastError(0xdeadbeef); ret = pCryptCATAdminReleaseContext(hca, 0); - ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected no change in last error, got %d\n", GetLastError()); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); /* Try to release a second time */ SetLastError(0xdeadbeef);

1 0

Detlef Riekenberg : winmm/tests: Fix a test on win98.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: be0721d4427bd8f8814998ebcae88aa10da7e1f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be0721d4427bd8f8814998ebc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 8 22:15:17 2009 +0200 winmm/tests: Fix a test on win98. --- dlls/winmm/tests/mixer.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index b54bb83..59627a7 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -1030,9 +1030,12 @@ static void test_mixerOpen(void) mmsys_error(rc)); rc = mixerOpen(&mix, d, 0xdeadbeef, 0, CALLBACK_WINDOW); - ok(rc == MMSYSERR_INVALPARAM, + ok(rc == MMSYSERR_INVALPARAM || + rc == MMSYSERR_NOERROR, /* 98 */ "mixerOpen: MMSYSERR_INVALPARAM expected, got %s\n", mmsys_error(rc)); + if (rc == MMSYSERR_NOERROR) + test_mixerClose(mix); /* Test mixerOpen with a NULL dwCallback and CALLBACK_WINDOW flag. */ rc = mixerOpen(&mix, d, 0, 0, CALLBACK_WINDOW);

1 0

Detlef Riekenberg : urlmon/tests: Allow BINDSTATUS_COOKIE_SENT in a test.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: 081576e157fdb5b7929f0f13599b369c2b18ad8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=081576e157fdb5b7929f0f135… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 8 22:17:29 2009 +0200 urlmon/tests: Allow BINDSTATUS_COOKIE_SENT in a test. --- dlls/urlmon/tests/url.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 9d10a59..6d3832e 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1338,6 +1338,9 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallback *iface, ULONG ulP case BINDSTATUS_PROXYDETECTING: trace("BINDSTATUS_PROXYDETECTING\n"); break; + case BINDSTATUS_COOKIE_SENT: + trace("BINDSTATUS_COOKIE_SENT\n"); + break; default: ok(0, "unexpected code %d\n", ulStatusCode); };

1 0

Rein Klazes : win87em: Always return that a 8087 coprocessor is present.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: f33ce58be8d3b39206f13c73ff2aca470cf17366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f33ce58be8d3b39206f13c73f… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Apr 9 07:09:18 2009 +0200 win87em: Always return that a 8087 coprocessor is present. --- dlls/win87em.dll16/win87em.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/win87em.dll16/win87em.c b/dlls/win87em.dll16/win87em.c index 35a04c4..d3fc96a 100644 --- a/dlls/win87em.dll16/win87em.c +++ b/dlls/win87em.dll16/win87em.c @@ -45,7 +45,7 @@ struct Win87EmInfoStruct */ /* FIXME: Still rather skeletal implementation only */ -static BOOL Installed = 0; +static BOOL Installed = 1; /* 8087 is installed */ static WORD RefCount = 0; static WORD CtrlWord_1 = 0; static WORD CtrlWord_2 = 0;

1 0

Hans Leidekker : wininet: Don't start reading when POST data hasn' t been completely written.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: 3a711fb56b394ffcaf1777c18b3325b4232abefe URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a711fb56b394ffcaf1777c18… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Apr 8 15:22:26 2009 +0200 wininet: Don't start reading when POST data hasn't been completely written. --- dlls/wininet/http.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c35badc..3777d4c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3513,10 +3513,23 @@ lend: /* TODO: send notification for P3P header */ - if(lpwhr->lpHttpSession->lpAppInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - if(bSuccess) { - HTTP_ReceiveRequestData(lpwhr, TRUE); - }else { + if (lpwhr->lpHttpSession->lpAppInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) + { + if (bSuccess) + { + if (lpwhr->dwBytesWritten == lpwhr->dwBytesToWrite) HTTP_ReceiveRequestData(lpwhr, TRUE); + else + { + iar.dwResult = (DWORD_PTR)lpwhr->hdr.hInternet; + iar.dwError = 0; + + INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, + INTERNET_STATUS_REQUEST_COMPLETE, &iar, + sizeof(INTERNET_ASYNC_RESULT)); + } + } + else + { iar.dwResult = (DWORD_PTR)lpwhr->hdr.hInternet; iar.dwError = INTERNET_GetLastError();

1 0

Hans Leidekker : wininet: Support asynchronous HttpEndRequest.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: 8077480b0e793219216b336c8d241a676afb4986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8077480b0e793219216b336c8… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Apr 8 15:22:44 2009 +0200 wininet: Support asynchronous HttpEndRequest. --- dlls/wininet/http.c | 168 ++++++++++++++++++++++++----------------------- dlls/wininet/internet.h | 7 ++ 2 files changed, 93 insertions(+), 82 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3777d4c..8d03b61 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -714,57 +714,87 @@ BOOL WINAPI HttpAddRequestHeadersA(HINTERNET hHttpRequest, BOOL WINAPI HttpEndRequestA(HINTERNET hRequest, LPINTERNET_BUFFERSA lpBuffersOut, DWORD dwFlags, DWORD_PTR dwContext) { - LPINTERNET_BUFFERSA ptr; - LPINTERNET_BUFFERSW lpBuffersOutW,ptrW; + TRACE("(%p, %p, %08x, %08lx)\n", hRequest, lpBuffersOut, dwFlags, dwContext); + + if (lpBuffersOut) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return HttpEndRequestW(hRequest, NULL, dwFlags, dwContext); +} + +static BOOL HTTP_HttpEndRequestW(LPWININETHTTPREQW lpwhr, DWORD dwFlags, DWORD_PTR dwContext) +{ BOOL rc = FALSE; + INT responseLen; + DWORD dwBufferSize; + INTERNET_ASYNC_RESULT iar; - TRACE("(%p, %p, %08x, %08lx): stub\n", hRequest, lpBuffersOut, dwFlags, - dwContext); + INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, + INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); - ptr = lpBuffersOut; - if (ptr) - lpBuffersOutW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(INTERNET_BUFFERSW)); - else - lpBuffersOutW = NULL; + responseLen = HTTP_GetResponseHeaders(lpwhr, TRUE); + if (responseLen) + rc = TRUE; - ptrW = lpBuffersOutW; - while (ptr) - { - if (ptr->lpvBuffer && ptr->dwBufferLength) - ptrW->lpvBuffer = HeapAlloc(GetProcessHeap(),0,ptr->dwBufferLength); - ptrW->dwBufferLength = ptr->dwBufferLength; - ptrW->dwBufferTotal= ptr->dwBufferTotal; + INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, + INTERNET_STATUS_RESPONSE_RECEIVED, &responseLen, sizeof(DWORD)); - if (ptr->Next) - ptrW->Next = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, - sizeof(INTERNET_BUFFERSW)); + /* process cookies here. Is this right? */ + HTTP_ProcessCookies(lpwhr); - ptr = ptr->Next; - ptrW = ptrW->Next; - } + dwBufferSize = sizeof(lpwhr->dwContentLength); + if (!HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, + &lpwhr->dwContentLength, &dwBufferSize, NULL)) + lpwhr->dwContentLength = -1; - rc = HttpEndRequestW(hRequest, lpBuffersOutW, dwFlags, dwContext); + if (lpwhr->dwContentLength == 0) + HTTP_FinishedReading(lpwhr); - if (lpBuffersOutW) + if (!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT)) { - ptrW = lpBuffersOutW; - while (ptrW) + DWORD dwCode,dwCodeLength = sizeof(DWORD); + if (HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE, &dwCode, &dwCodeLength, NULL) && + (dwCode == 302 || dwCode == 301 || dwCode == 303)) { - LPINTERNET_BUFFERSW ptrW2; - - FIXME("Do we need to translate info out of these buffer?\n"); - - HeapFree(GetProcessHeap(),0,ptrW->lpvBuffer); - ptrW2 = ptrW->Next; - HeapFree(GetProcessHeap(),0,ptrW); - ptrW = ptrW2; + WCHAR szNewLocation[INTERNET_MAX_URL_LENGTH]; + dwBufferSize=sizeof(szNewLocation); + if (HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_LOCATION, szNewLocation, &dwBufferSize, NULL)) + { + /* redirects are always GETs */ + HeapFree(GetProcessHeap(), 0, lpwhr->lpszVerb); + lpwhr->lpszVerb = WININET_strdupW(szGET); + HTTP_DrainContent(lpwhr); + INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, + INTERNET_STATUS_REDIRECT, szNewLocation, dwBufferSize); + rc = HTTP_HandleRedirect(lpwhr, szNewLocation); + if (rc) + rc = HTTP_HttpSendRequestW(lpwhr, NULL, 0, NULL, 0, 0, TRUE); + } } } + iar.dwResult = (DWORD_PTR)lpwhr->hdr.hInternet; + iar.dwError = rc ? 0 : INTERNET_GetLastError(); + + INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, + INTERNET_STATUS_REQUEST_COMPLETE, &iar, + sizeof(INTERNET_ASYNC_RESULT)); return rc; } +static void AsyncHttpEndRequestProc(WORKREQUEST *work) +{ + struct WORKREQ_HTTPENDREQUESTW const *req = &work->u.HttpEndRequestW; + LPWININETHTTPREQW lpwhr = (LPWININETHTTPREQW)work->hdr; + + TRACE("%p\n", lpwhr); + + HTTP_HttpEndRequestW(lpwhr, req->dwFlags, req->dwContext); +} + /*********************************************************************** * HttpEndRequestW (WININET.@) * @@ -780,10 +810,15 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, { BOOL rc = FALSE; LPWININETHTTPREQW lpwhr; - INT responseLen; - DWORD dwBufferSize; TRACE("-->\n"); + + if (lpBuffersOut) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + lpwhr = (LPWININETHTTPREQW) WININET_GetObject( hRequest ); if (NULL == lpwhr || lpwhr->hdr.htype != WH_HHTTPREQ) @@ -791,58 +826,27 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); if (lpwhr) WININET_Release( &lpwhr->hdr ); - return FALSE; + return FALSE; } - lpwhr->hdr.dwFlags |= dwFlags; - lpwhr->hdr.dwContext = dwContext; - /* We appear to do nothing with lpBuffersOut.. is that correct? */ - - SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, - INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); - - responseLen = HTTP_GetResponseHeaders(lpwhr, TRUE); - if (responseLen) - rc = TRUE; - - SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, - INTERNET_STATUS_RESPONSE_RECEIVED, &responseLen, sizeof(DWORD)); - - /* process cookies here. Is this right? */ - HTTP_ProcessCookies(lpwhr); + if (lpwhr->lpHttpSession->lpAppInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) + { + WORKREQUEST work; + struct WORKREQ_HTTPENDREQUESTW *request; - dwBufferSize = sizeof(lpwhr->dwContentLength); - if (!HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, - &lpwhr->dwContentLength,&dwBufferSize,NULL)) - lpwhr->dwContentLength = -1; + work.asyncproc = AsyncHttpEndRequestProc; + work.hdr = WININET_AddRef( &lpwhr->hdr ); - if (lpwhr->dwContentLength == 0) - HTTP_FinishedReading(lpwhr); + request = &work.u.HttpEndRequestW; + request->dwFlags = dwFlags; + request->dwContext = dwContext; - if(!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT)) - { - DWORD dwCode,dwCodeLength=sizeof(DWORD); - if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE,&dwCode,&dwCodeLength,NULL) && - (dwCode==302 || dwCode==301 || dwCode==303)) - { - WCHAR szNewLocation[INTERNET_MAX_URL_LENGTH]; - dwBufferSize=sizeof(szNewLocation); - if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL)) - { - /* redirects are always GETs */ - HeapFree(GetProcessHeap(),0,lpwhr->lpszVerb); - lpwhr->lpszVerb = WININET_strdupW(szGET); - HTTP_DrainContent(lpwhr); - INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, - INTERNET_STATUS_REDIRECT, szNewLocation, - dwBufferSize); - rc = HTTP_HandleRedirect(lpwhr, szNewLocation); - if (rc) - rc = HTTP_HttpSendRequestW(lpwhr, NULL, 0, NULL, 0, 0, TRUE); - } - } + INTERNET_AsyncCall(&work); + INTERNET_SetLastError(ERROR_IO_PENDING); } + else + rc = HTTP_HttpEndRequestW(lpwhr, dwFlags, dwContext); WININET_Release( &lpwhr->hdr ); TRACE("%i <--\n",rc); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 8e92788..f69c424 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -291,6 +291,12 @@ struct WORKREQ_HTTPSENDREQUESTW BOOL bEndRequest; }; +struct WORKREQ_HTTPENDREQUESTW +{ + DWORD dwFlags; + DWORD_PTR dwContext; +}; + struct WORKREQ_SENDCALLBACK { DWORD_PTR dwContext; @@ -337,6 +343,7 @@ typedef struct WORKREQ struct WORKREQ_FTPRENAMEFILEW FtpRenameFileW; struct WORKREQ_FTPFINDNEXTW FtpFindNextW; struct WORKREQ_HTTPSENDREQUESTW HttpSendRequestW; + struct WORKREQ_HTTPENDREQUESTW HttpEndRequestW; struct WORKREQ_SENDCALLBACK SendCallback; struct WORKREQ_INTERNETOPENURLW InternetOpenUrlW; struct WORKREQ_INTERNETREADFILEEXA InternetReadFileExA;

1 0

Hans Leidekker : wininet: Add tests for asynchronous HttpSendRequestEx/ HttpEndRequest.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: 75857d7d67d9ce9cf1870cbd821364b28e458f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75857d7d67d9ce9cf1870cbd8… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Apr 8 15:23:14 2009 +0200 wininet: Add tests for asynchronous HttpSendRequestEx/HttpEndRequest. --- dlls/wininet/tests/http.c | 192 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 192 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 044b96f..a573e14 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2285,6 +2285,197 @@ static void test_open_url_async(void) CloseHandle(ctx.event); } +enum api +{ + internet_connect = 1, + http_open_request, + http_send_request_ex, + internet_writefile, + http_end_request, + internet_close_handle +}; + +struct notification +{ + enum api function; /* api responsible for notification */ + unsigned int status; /* status received */ + int async; /* delivered from another thread? */ + int todo; +}; + +struct info +{ + enum api function; + const struct notification *test; + unsigned int count; + unsigned int index; + HANDLE wait; + DWORD thread; + unsigned int line; +}; + +static CRITICAL_SECTION notification_cs; + +static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DWORD status, LPVOID buffer, DWORD buflen ) +{ + BOOL status_ok, function_ok; + struct info *info = (struct info *)context; + unsigned int i; + + EnterCriticalSection( &notification_cs ); + + if (status == INTERNET_STATUS_HANDLE_CREATED) + { + DWORD size = sizeof(struct info *); + HttpQueryInfoA( handle, INTERNET_OPTION_CONTEXT_VALUE, &info, &size, 0 ); + } + i = info->index; + if (i >= info->count) + { + LeaveCriticalSection( &notification_cs ); + return; + } + + status_ok = (info->test[i].status == status); + function_ok = (info->test[i].function == info->function); + + if (!info->test[i].todo) + { + ok( status_ok, "%u: expected status %u got %u\n", info->line, info->test[i].status, status ); + ok( function_ok, "%u: expected function %u got %u\n", info->line, info->test[i].function, info->function ); + + if (info->test[i].async) + ok(info->thread != GetCurrentThreadId(), "%u: expected thread %u got %u\n", + info->line, info->thread, GetCurrentThreadId()); + } + else + { + todo_wine ok( status_ok, "%u: expected status %u got %u\n", info->line, info->test[i].status, status ); + if (status_ok) + todo_wine ok( function_ok, "%u: expected function %u got %u\n", info->line, info->test[i].function, info->function ); + } + if (i == info->count - 1 || info->test[i].function != info->test[i + 1].function) SetEvent( info->wait ); + info->index++; + + LeaveCriticalSection( &notification_cs ); +} + +static void setup_test( struct info *info, enum api function, unsigned int line ) +{ + info->function = function; + info->line = line; +} + +static const struct notification async_send_request_ex_test[] = +{ + { internet_connect, INTERNET_STATUS_HANDLE_CREATED, 0 }, + { http_open_request, INTERNET_STATUS_HANDLE_CREATED, 0 }, + { http_send_request_ex, INTERNET_STATUS_RESOLVING_NAME, 1 }, + { http_send_request_ex, INTERNET_STATUS_NAME_RESOLVED, 1 }, + { http_send_request_ex, INTERNET_STATUS_CONNECTING_TO_SERVER, 1 }, + { http_send_request_ex, INTERNET_STATUS_CONNECTED_TO_SERVER, 1 }, + { http_send_request_ex, INTERNET_STATUS_SENDING_REQUEST, 1 }, + { http_send_request_ex, INTERNET_STATUS_REQUEST_SENT, 1 }, + { http_send_request_ex, INTERNET_STATUS_REQUEST_COMPLETE, 1 }, + { internet_writefile, INTERNET_STATUS_SENDING_REQUEST, 0 }, + { internet_writefile, INTERNET_STATUS_REQUEST_SENT, 0 }, + { http_end_request, INTERNET_STATUS_RECEIVING_RESPONSE, 1 }, + { http_end_request, INTERNET_STATUS_RESPONSE_RECEIVED, 1 }, + { http_end_request, INTERNET_STATUS_REQUEST_COMPLETE, 1 }, + { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING, 0, 1 }, + { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING, 0, 1 } +}; + +static void test_async_HttpSendRequestEx(void) +{ + BOOL ret; + HINTERNET ses, req, con; + struct info info; + DWORD size, written, error; + INTERNET_BUFFERSA b; + static const char *accept[2] = {"*/*", NULL}; + static char data[] = "Public ID=codeweavers"; + char buffer[32]; + + InitializeCriticalSection( &notification_cs ); + + info.test = async_send_request_ex_test; + info.count = sizeof(async_send_request_ex_test)/sizeof(async_send_request_ex_test[0]); + info.index = 0; + info.wait = CreateEvent( NULL, FALSE, FALSE, NULL ); + info.thread = GetCurrentThreadId(); + + ses = InternetOpen( "winetest", 0, NULL, NULL, INTERNET_FLAG_ASYNC ); + ok( ses != NULL, "InternetOpen failed\n" ); + + pInternetSetStatusCallbackA( ses, check_notification ); + + setup_test( &info, internet_connect, __LINE__ ); + con = InternetConnect( ses, "crossover.codeweavers.com", 80, NULL, NULL, INTERNET_SERVICE_HTTP, 0, (DWORD_PTR)&info ); + ok( con != NULL, "InternetConnect failed %u\n", GetLastError() ); + + WaitForSingleObject( info.wait, 10000 ); + + setup_test( &info, http_open_request, __LINE__ ); + req = HttpOpenRequest( con, "POST", "posttest.php", NULL, NULL, accept, 0, (DWORD_PTR)&info ); + ok( req != NULL, "HttpOpenRequest failed %u\n", GetLastError() ); + + WaitForSingleObject( info.wait, 10000 ); + + memset( &b, 0, sizeof(INTERNET_BUFFERSA) ); + b.dwStructSize = sizeof(INTERNET_BUFFERSA); + b.lpcszHeader = "Content-Type: application/x-www-form-urlencoded"; + b.dwHeadersLength = strlen( b.lpcszHeader ); + b.dwBufferTotal = strlen( data ); + + setup_test( &info, http_send_request_ex, __LINE__ ); + ret = HttpSendRequestExA( req, &b, NULL, 0x28, 0 ); + ok( !ret && GetLastError() == ERROR_IO_PENDING, "HttpSendRequestExA failed %d %u\n", ret, GetLastError() ); + + WaitForSingleObject( info.wait, 10000 ); + + size = sizeof(buffer); + SetLastError( 0xdeadbeef ); + ret = HttpQueryInfoA( req, HTTP_QUERY_CONTENT_ENCODING, buffer, &size, 0 ); + error = GetLastError(); + ok( !ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + todo_wine + ok( error == ERROR_INTERNET_INCORRECT_HANDLE_STATE, + "expected ERROR_INTERNET_INCORRECT_HANDLE_STATE got %u\n", error ); + + written = 0; + size = strlen( data ); + setup_test( &info, internet_writefile, __LINE__ ); + ret = InternetWriteFile( req, data, size, &written ); + ok( ret, "InternetWriteFile failed %u\n", GetLastError() ); + ok( written == size, "expected %u got %u\n", written, size ); + + WaitForSingleObject( info.wait, 10000 ); + + SetLastError( 0xdeadbeef ); + ret = HttpEndRequestA( req, (void *)data, 0x28, 0 ); + error = GetLastError(); + ok( !ret, "HttpEndRequestA succeeded\n" ); + ok( error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", error ); + + SetLastError( 0xdeadbeef ); + setup_test( &info, http_end_request, __LINE__ ); + ret = HttpEndRequestA( req, NULL, 0x28, 0 ); + error = GetLastError(); + ok( !ret, "HttpEndRequestA succeeded\n" ); + ok( error == ERROR_IO_PENDING, "expected ERROR_IO_PENDING got %u\n", error ); + + WaitForSingleObject( info.wait, 10000 ); + + setup_test( &info, internet_close_handle, __LINE__ ); + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); + + WaitForSingleObject( info.wait, 10000 ); + CloseHandle( info.wait ); +} + #define STATUS_STRING(status) \ memcpy(status_string[status], #status, sizeof(CHAR) * \ (strlen(#status) < MAX_STATUS_NAME ? \ @@ -2341,6 +2532,7 @@ START_TEST(http) InternetReadFile_test(0); InternetReadFileExA_test(INTERNET_FLAG_ASYNC); test_open_url_async(); + test_async_HttpSendRequestEx(); } InternetOpenRequest_test(); test_http_cache();

1 0

Henri Verbeet : wined3d: Fix some more 3 space indentation.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: 375780a5a845baaf61bebca165008936372cb66e URL: http://source.winehq.org/git/wine.git/?a=commit;h=375780a5a845baaf61bebca16… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 8 08:35:06 2009 +0200 wined3d: Fix some more 3 space indentation. --- dlls/wined3d/glsl_shader.c | 74 ++++++++++++++++++++++---------------------- 1 files changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f367e1f..10f1b4f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2996,48 +2996,48 @@ static void pshader_glsl_dp2add(const struct wined3d_shader_instruction *ins) static void pshader_glsl_input_pack(SHADER_BUFFER *buffer, const struct wined3d_shader_semantic *semantics_in, IWineD3DPixelShader *iface, enum vertexprocessing_mode vertexprocessing) { - unsigned int i; - IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *) iface; + unsigned int i; + IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; - for (i = 0; i < MAX_REG_INPUT; i++) { + for (i = 0; i < MAX_REG_INPUT; ++i) + { + DWORD usage_token = semantics_in[i].usage; + DWORD usage, usage_idx; + char reg_mask[6]; - DWORD usage_token = semantics_in[i].usage; - DWORD usage, usage_idx; - char reg_mask[6]; + /* Uninitialized */ + if (!usage_token) continue; + usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; + usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; + shader_glsl_get_write_mask(semantics_in[i].reg.token, reg_mask); - /* Uninitialized */ - if (!usage_token) continue; - usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; - usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; - shader_glsl_get_write_mask(semantics_in[i].reg.token, reg_mask); + switch (usage) + { + case WINED3DDECLUSAGE_TEXCOORD: + if (usage_idx < 8 && vertexprocessing == pretransformed) + shader_addline(buffer, "IN[%u]%s = gl_TexCoord[%u]%s;\n", + This->input_reg_map[i], reg_mask, usage_idx, reg_mask); + else + shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", + This->input_reg_map[i], reg_mask, reg_mask); + break; - switch(usage) { + case WINED3DDECLUSAGE_COLOR: + if (usage_idx == 0) + shader_addline(buffer, "IN[%u]%s = vec4(gl_Color)%s;\n", + This->input_reg_map[i], reg_mask, reg_mask); + else if (usage_idx == 1) + shader_addline(buffer, "IN[%u]%s = vec4(gl_SecondaryColor)%s;\n", + This->input_reg_map[i], reg_mask, reg_mask); + else + shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", + This->input_reg_map[i], reg_mask, reg_mask); + break; - case WINED3DDECLUSAGE_TEXCOORD: - if(usage_idx < 8 && vertexprocessing == pretransformed) { - shader_addline(buffer, "IN[%u]%s = gl_TexCoord[%u]%s;\n", - This->input_reg_map[i], reg_mask, usage_idx, reg_mask); - } else { - shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", - This->input_reg_map[i], reg_mask, reg_mask); - } - break; - - case WINED3DDECLUSAGE_COLOR: - if (usage_idx == 0) - shader_addline(buffer, "IN[%u]%s = vec4(gl_Color)%s;\n", - This->input_reg_map[i], reg_mask, reg_mask); - else if (usage_idx == 1) - shader_addline(buffer, "IN[%u]%s = vec4(gl_SecondaryColor)%s;\n", - This->input_reg_map[i], reg_mask, reg_mask); - else - shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", - This->input_reg_map[i], reg_mask, reg_mask); - break; - - default: - shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", - This->input_reg_map[i], reg_mask, reg_mask); + default: + shader_addline(buffer, "IN[%u]%s = vec4(0.0, 0.0, 0.0, 0.0)%s;\n", + This->input_reg_map[i], reg_mask, reg_mask); + break; } } }

1 0

Henri Verbeet : wined3d: Properly check if input/output varyings are used.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: a1dedbdf58feade76a679e9532b5d568c6972439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1dedbdf58feade76a679e953… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 8 08:35:07 2009 +0200 wined3d: Properly check if input/output varyings are used. --- dlls/wined3d/glsl_shader.c | 41 +++++++++++++++++++++++------------------ dlls/wined3d/vertexshader.c | 13 +++++++++---- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 10f1b4f..1edf02b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2993,20 +2993,23 @@ static void pshader_glsl_dp2add(const struct wined3d_shader_instruction *ins) } } -static void pshader_glsl_input_pack(SHADER_BUFFER *buffer, const struct wined3d_shader_semantic *semantics_in, - IWineD3DPixelShader *iface, enum vertexprocessing_mode vertexprocessing) +static void pshader_glsl_input_pack(IWineD3DPixelShader *iface, SHADER_BUFFER *buffer, + const struct wined3d_shader_semantic *semantics_in, const struct shader_reg_maps *reg_maps, + enum vertexprocessing_mode vertexprocessing) { unsigned int i; IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; for (i = 0; i < MAX_REG_INPUT; ++i) { - DWORD usage_token = semantics_in[i].usage; + DWORD usage_token; DWORD usage, usage_idx; char reg_mask[6]; - /* Uninitialized */ - if (!usage_token) continue; + /* Unused */ + if (!reg_maps->packed_input[i]) continue; + + usage_token = semantics_in[i].usage; usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; shader_glsl_get_write_mask(semantics_in[i].reg.token, reg_mask); @@ -3091,8 +3094,9 @@ static void delete_glsl_program_entry(struct shader_glsl_priv *priv, const WineD HeapFree(GetProcessHeap(), 0, entry); } -static void handle_ps3_input(SHADER_BUFFER *buffer, const struct wined3d_shader_semantic *semantics_in, - const struct wined3d_shader_semantic *semantics_out, const WineD3D_GL_Info *gl_info, const DWORD *map) +static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_info, const DWORD *map, + const struct wined3d_shader_semantic *semantics_in, const struct shader_reg_maps *reg_maps_in, + const struct wined3d_shader_semantic *semantics_out, const struct shader_reg_maps *reg_maps_out) { unsigned int i, j; DWORD usage_token, usage_token_out; @@ -3112,8 +3116,7 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const struct wined3d_shader_ } for(i = 0; i < MAX_REG_INPUT; i++) { - usage_token = semantics_in[i].usage; - if (!usage_token) continue; + if (!reg_maps_in->packed_input[i]) continue; in_idx = map[i]; if (in_idx >= (in_count + 2)) { @@ -3134,6 +3137,7 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const struct wined3d_shader_ sprintf(destination, "IN[%u]", in_idx); } + usage_token = semantics_in[i].usage; usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; set[map[i]] = shader_glsl_get_write_mask(semantics_in[i].reg.token, reg_mask); @@ -3174,9 +3178,9 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const struct wined3d_shader_ } else { BOOL found = FALSE; for(j = 0; j < MAX_REG_OUTPUT; j++) { - usage_token_out = semantics_out[j].usage; - if (!usage_token_out) continue; + if (!reg_maps_out->packed_output[j]) continue; + usage_token_out = semantics_out[j].usage; usage_out = (usage_token_out & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; usage_idx_out = (usage_token_out & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; shader_glsl_get_write_mask(semantics_out[j].reg.token, reg_mask_out); @@ -3283,9 +3287,9 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs shader_addline(&buffer, "void order_ps_input(in vec4 OUT[%u]) {\n", MAX_REG_OUTPUT); for(i = 0; i < MAX_REG_OUTPUT; i++) { - usage_token = semantics_out[i].usage; - if (!usage_token) continue; + if (!vs->baseShader.reg_maps.packed_output[i]) continue; + usage_token = semantics_out[i].usage; usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; writemask = shader_glsl_get_write_mask(semantics_out[i].reg.token, reg_mask); @@ -3338,9 +3342,9 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs /* First, sort out position and point size. Those are not passed to the pixel shader */ for(i = 0; i < MAX_REG_OUTPUT; i++) { - usage_token = semantics_out[i].usage; - if (!usage_token) continue; + if (!vs->baseShader.reg_maps.packed_output[i]) continue; + usage_token = semantics_out[i].usage; usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; shader_glsl_get_write_mask(semantics_out[i].reg.token, reg_mask); @@ -3360,7 +3364,8 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs } /* Then, fix the pixel shader input */ - handle_ps3_input(&buffer, semantics_in, semantics_out, gl_info, ps->input_reg_map); + handle_ps3_input(&buffer, gl_info, ps->input_reg_map, + semantics_in, &ps->baseShader.reg_maps, semantics_out, &vs->baseShader.reg_maps); shader_addline(&buffer, "}\n"); } else if(ps_major >= 3 && vs_major < 3) { @@ -3372,7 +3377,7 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs * point size, but we depend on the optimizers kindness to find out that the pixel shader doesn't * read gl_TexCoord and gl_ColorX, otherwise we'll run out of varyings */ - handle_ps3_input(&buffer, semantics_in, NULL, gl_info, ps->input_reg_map); + handle_ps3_input(&buffer, gl_info, ps->input_reg_map, semantics_in, &ps->baseShader.reg_maps, NULL, NULL); shader_addline(&buffer, "}\n"); } else { ERR("Unexpected vertex and pixel shader version condition: vs: %d, ps: %d\n", vs_major, ps_major); @@ -3967,7 +3972,7 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShader *iface, SHADER_BU /* Pack 3.0 inputs */ if (reg_maps->shader_version >= WINED3DPS_VERSION(3,0) && args->vp_mode != vertexshader) { - pshader_glsl_input_pack(buffer, This->semantics_in, iface, args->vp_mode); + pshader_glsl_input_pack(iface, buffer, This->semantics_in, reg_maps, args->vp_mode); } /* Base Shader Body */ diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 8f7ce1d..5349528 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -209,11 +209,16 @@ BOOL vshader_get_input( int i; for (i = 0; i < MAX_ATTRIBS; i++) { - DWORD usage_token = This->semantics_in[i].usage; - DWORD usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; - DWORD usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; + DWORD usage_token, usage, usage_idx; - if (usage_token && match_usage(usage, usage_idx, usage_req, usage_idx_req)) { + if (!This->baseShader.reg_maps.attributes[i]) continue; + + usage_token = This->semantics_in[i].usage; + usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; + usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; + + if (match_usage(usage, usage_idx, usage_req, usage_idx_req)) + { *regnum = i; return TRUE; }

1 0

Henri Verbeet : wined3d: Store usage and usage_idx in struct wined3d_shader_semantic.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: 9ec0b09d35bc747f62b29ee0a1ab34ae8b26873c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ec0b09d35bc747f62b29ee0a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 8 08:35:07 2009 +0200 wined3d: Store usage and usage_idx in struct wined3d_shader_semantic. Instead of the usage token. --- dlls/wined3d/baseshader.c | 8 ++++++-- dlls/wined3d/glsl_shader.c | 28 ++++++++++------------------ dlls/wined3d/vertexshader.c | 16 ++++------------ dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 22 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index a1d1651..c7931ee 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -297,13 +297,17 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m else reg_maps->packed_input[regnum] = 1; - semantics_in[regnum].usage = usage; + semantics_in[regnum].usage = (usage & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; + semantics_in[regnum].usage_idx = + (usage & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; shader_parse_dst_param(param, 0, &semantics_in[regnum].reg); /* Vshader: mark 3.0 output registers used, save token */ } else if (WINED3DSPR_OUTPUT == regtype) { reg_maps->packed_output[regnum] = 1; - semantics_out[regnum].usage = usage; + semantics_out[regnum].usage = (usage & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; + semantics_out[regnum].usage_idx = + (usage & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; shader_parse_dst_param(param, 0, &semantics_out[regnum].reg); if (usage & (WINED3DDECLUSAGE_FOG << WINED3DSP_DCL_USAGE_SHIFT)) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1edf02b..8ad4175 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3002,16 +3002,14 @@ static void pshader_glsl_input_pack(IWineD3DPixelShader *iface, SHADER_BUFFER *b for (i = 0; i < MAX_REG_INPUT; ++i) { - DWORD usage_token; DWORD usage, usage_idx; char reg_mask[6]; /* Unused */ if (!reg_maps->packed_input[i]) continue; - usage_token = semantics_in[i].usage; - usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; - usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; + usage = semantics_in[i].usage; + usage_idx = semantics_in[i].usage_idx; shader_glsl_get_write_mask(semantics_in[i].reg.token, reg_mask); switch (usage) @@ -3099,7 +3097,6 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in const struct wined3d_shader_semantic *semantics_out, const struct shader_reg_maps *reg_maps_out) { unsigned int i, j; - DWORD usage_token, usage_token_out; DWORD usage, usage_idx, usage_out, usage_idx_out; DWORD *set; DWORD in_idx; @@ -3137,9 +3134,8 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in sprintf(destination, "IN[%u]", in_idx); } - usage_token = semantics_in[i].usage; - usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; - usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; + usage = semantics_in[i].usage; + usage_idx = semantics_in[i].usage_idx; set[map[i]] = shader_glsl_get_write_mask(semantics_in[i].reg.token, reg_mask); if(!semantics_out) { @@ -3180,9 +3176,8 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in for(j = 0; j < MAX_REG_OUTPUT; j++) { if (!reg_maps_out->packed_output[j]) continue; - usage_token_out = semantics_out[j].usage; - usage_out = (usage_token_out & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; - usage_idx_out = (usage_token_out & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; + usage_out = semantics_out[j].usage; + usage_idx_out = semantics_out[j].usage_idx; shader_glsl_get_write_mask(semantics_out[j].reg.token, reg_mask_out); if(usage == usage_out && @@ -3254,7 +3249,6 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs DWORD ps_major = ps ? WINED3DSHADER_VERSION_MAJOR(ps->baseShader.reg_maps.shader_version) : 0; unsigned int i; SHADER_BUFFER buffer; - DWORD usage_token; DWORD usage, usage_idx, writemask; char reg_mask[6]; const struct wined3d_shader_semantic *semantics_out, *semantics_in; @@ -3289,9 +3283,8 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs for(i = 0; i < MAX_REG_OUTPUT; i++) { if (!vs->baseShader.reg_maps.packed_output[i]) continue; - usage_token = semantics_out[i].usage; - usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; - usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; + usage = semantics_out[i].usage; + usage_idx = semantics_out[i].usage_idx; writemask = shader_glsl_get_write_mask(semantics_out[i].reg.token, reg_mask); switch(usage) { @@ -3344,9 +3337,8 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs for(i = 0; i < MAX_REG_OUTPUT; i++) { if (!vs->baseShader.reg_maps.packed_output[i]) continue; - usage_token = semantics_out[i].usage; - usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; - usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; + usage = semantics_out[i].usage; + usage_idx = semantics_out[i].usage_idx; shader_glsl_get_write_mask(semantics_out[i].reg.token, reg_mask); switch(usage) { diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 5349528..8369251 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -174,15 +174,12 @@ static void vshader_set_input( unsigned int regnum, BYTE usage, BYTE usage_idx) { - /* Fake usage: set reserved bit, usage, usage_idx */ - DWORD usage_token = (0x1 << 31) | - (usage << WINED3DSP_DCL_USAGE_SHIFT) | (usage_idx << WINED3DSP_DCL_USAGEINDEX_SHIFT); - /* Fake register; set reserved bit, regnum, type: input, wmask: all */ DWORD reg_token = (0x1 << 31) | WINED3DSP_WRITEMASK_ALL | (WINED3DSPR_INPUT << WINED3DSP_REGTYPE_SHIFT) | regnum; - This->semantics_in[regnum].usage = usage_token; + This->semantics_in[regnum].usage = usage; + This->semantics_in[regnum].usage_idx = usage_idx; This->semantics_in[regnum].reg.register_type = WINED3DSPR_INPUT; This->semantics_in[regnum].reg.register_idx = regnum; This->semantics_in[regnum].reg.write_mask = WINED3DSP_WRITEMASK_ALL; @@ -209,15 +206,10 @@ BOOL vshader_get_input( int i; for (i = 0; i < MAX_ATTRIBS; i++) { - DWORD usage_token, usage, usage_idx; - if (!This->baseShader.reg_maps.attributes[i]) continue; - usage_token = This->semantics_in[i].usage; - usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; - usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; - - if (match_usage(usage, usage_idx, usage_req, usage_idx_req)) + if (match_usage(This->semantics_in[i].usage, + This->semantics_in[i].usage_idx, usage_req, usage_idx_req)) { *regnum = i; return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e77702e..59944a4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -472,7 +472,8 @@ struct wined3d_shader_instruction struct wined3d_shader_semantic { - DWORD usage; + WINED3DDECLUSAGE usage; + UINT usage_idx; struct wined3d_shader_dst_param reg; };

1 0