December 2006 - Wine-Commits

Jacek Caban : wininet: Use proc instead of enum in INTERNETOPENURLW request .
by Alexandre Julliard Dec. 26, 2006

Dec. 26, 2006

Module: wine Branch: master Commit: 8c3ca8d817ea610dc8b0b6c8b6d7c17b77afeecf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3ca8d817ea610dc8b0b6c8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 25 21:33:49 2006 +0100 wininet: Use proc instead of enum in INTERNETOPENURLW request. --- dlls/wininet/internet.c | 31 ++++++++++++++++--------------- dlls/wininet/internet.h | 1 - 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 7a3d178..78c9c90 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2875,6 +2875,19 @@ HINTERNET WINAPI INTERNET_InternetOpenUr * RETURNS * handle of connection or NULL on failure */ +static void AsyncInternetOpenUrlProc(WORKREQUEST *workRequest) +{ + struct WORKREQ_INTERNETOPENURLW const *req = &workRequest->u.InternetOpenUrlW; + LPWININETAPPINFOW hIC = (LPWININETAPPINFOW) workRequest->hdr; + + TRACE("%p\n", hIC); + + INTERNET_InternetOpenUrlW(hIC, req->lpszUrl, + req->lpszHeaders, req->dwHeadersLength, req->dwFlags, req->dwContext); + HeapFree(GetProcessHeap(), 0, req->lpszUrl); + HeapFree(GetProcessHeap(), 0, req->lpszHeaders); +} + HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl, LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD dwContext) { @@ -2903,8 +2916,9 @@ HINTERNET WINAPI InternetOpenUrlW(HINTER if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { WORKREQUEST workRequest; struct WORKREQ_INTERNETOPENURLW *req; - - workRequest.asyncall = INTERNETOPENURLW; + + workRequest.asyncall = CALLASYNCPROC; + workRequest.asyncproc = AsyncInternetOpenUrlProc; workRequest.hdr = WININET_AddRef( &hIC->hdr ); req = &workRequest.u.InternetOpenUrlW; req->lpszUrl = WININET_strdupW(lpszUrl); @@ -3363,19 +3377,6 @@ static VOID INTERNET_ExecuteWork(void) } break; - case INTERNETOPENURLW: - { - struct WORKREQ_INTERNETOPENURLW *req = &workRequest.u.InternetOpenUrlW; - LPWININETAPPINFOW hIC = (LPWININETAPPINFOW) workRequest.hdr; - - TRACE("INTERNETOPENURLW %p\n", hIC); - - INTERNET_InternetOpenUrlW(hIC, req->lpszUrl, - req->lpszHeaders, req->dwHeadersLength, req->dwFlags, req->dwContext); - HeapFree(GetProcessHeap(), 0, req->lpszUrl); - HeapFree(GetProcessHeap(), 0, req->lpszHeaders); - } - break; case INTERNETREADFILEEXA: { struct WORKREQ_INTERNETREADFILEEXA *req = &workRequest.u.InternetReadFileExA; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 7a86e4f..989fb9a 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -261,7 +261,6 @@ typedef enum FTPREMOVEDIRECTORYW, FTPRENAMEFILEW, FTPFINDNEXTW, - INTERNETOPENURLW, INTERNETREADFILEEXA, } ASYNC_FUNC;

1 0

Jacek Caban : wininet: Use proc instead of enum in FTPUTFILE request.
by Alexandre Julliard Dec. 26, 2006

Dec. 26, 2006

Module: wine Branch: master Commit: 4adce67cf6e477d38fa425bc15af297c197e6ecf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4adce67cf6e477d38fa425bc1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 25 21:34:39 2006 +0100 wininet: Use proc instead of enum in FTPUTFILE request. --- dlls/wininet/ftp.c | 19 +++++++++++++++++-- dlls/wininet/internet.c | 15 --------------- dlls/wininet/internet.h | 1 - 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 961a915..5c97758 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -180,6 +180,20 @@ BOOL WINAPI FtpPutFileA(HINTERNET hConne * FALSE on failure * */ +static void AsyncFtpPutFileProc(WORKREQUEST *workRequest) +{ + struct WORKREQ_FTPPUTFILEW const *req = &workRequest->u.FtpPutFileW; + LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest->hdr; + + TRACE("%p\n", lpwfs); + + FTP_FtpPutFileW(lpwfs, req->lpszLocalFile, + req->lpszNewRemoteFile, req->dwFlags, req->dwContext); + + HeapFree(GetProcessHeap(), 0, req->lpszLocalFile); + HeapFree(GetProcessHeap(), 0, req->lpszNewRemoteFile); +} + BOOL WINAPI FtpPutFileW(HINTERNET hConnect, LPCWSTR lpszLocalFile, LPCWSTR lpszNewRemoteFile, DWORD dwFlags, DWORD dwContext) { @@ -200,8 +214,9 @@ BOOL WINAPI FtpPutFileW(HINTERNET hConne WORKREQUEST workRequest; struct WORKREQ_FTPPUTFILEW *req = &workRequest.u.FtpPutFileW; - workRequest.asyncall = FTPPUTFILEW; - workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); + workRequest.asyncall = CALLASYNCPROC; + workRequest.asyncproc = AsyncFtpPutFileProc; + workRequest.hdr = WININET_AddRef( &lpwfs->hdr ); req->lpszLocalFile = WININET_strdupW(lpszLocalFile); req->lpszNewRemoteFile = WININET_strdupW(lpszNewRemoteFile); req->dwFlags = dwFlags; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 5ef39ea..eb45c95 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3243,21 +3243,6 @@ static VOID INTERNET_ExecuteWork(void) workRequest.asyncproc(&workRequest); break; - case FTPPUTFILEW: - { - struct WORKREQ_FTPPUTFILEW *req = &workRequest.u.FtpPutFileW; - LPWININETFTPSESSIONW lpwfs = (LPWININETFTPSESSIONW) workRequest.hdr; - - TRACE("FTPPUTFILEW %p\n", lpwfs); - - FTP_FtpPutFileW(lpwfs, req->lpszLocalFile, - req->lpszNewRemoteFile, req->dwFlags, req->dwContext); - - HeapFree(GetProcessHeap(), 0, req->lpszLocalFile); - HeapFree(GetProcessHeap(), 0, req->lpszNewRemoteFile); - } - break; - case FTPSETCURRENTDIRECTORYW: { struct WORKREQ_FTPSETCURRENTDIRECTORYW *req; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index ee9c2d6..3e0a034 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -250,7 +250,6 @@ typedef struct typedef enum { CALLASYNCPROC, - FTPPUTFILEW, FTPSETCURRENTDIRECTORYW, FTPCREATEDIRECTORYW, FTPFINDFIRSTFILEW,

1 0

Jacek Caban : wininet: Use proc instead of enum in INTERNETREADFILEEXA request.
by Alexandre Julliard Dec. 26, 2006

Dec. 26, 2006

Module: wine Branch: master Commit: 662c885a0bb967c1cc80a26c0d4e67a140cf942f URL: http://source.winehq.org/git/wine.git/?a=commit;h=662c885a0bb967c1cc80a26c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 25 21:33:56 2006 +0100 wininet: Use proc instead of enum in INTERNETREADFILEEXA request. --- dlls/wininet/internet.c | 26 +++++++++++++------------- dlls/wininet/internet.h | 1 - 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 78c9c90..5ef39ea 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1810,6 +1810,17 @@ BOOL WINAPI InternetReadFile(HINTERNET h * SEE * InternetOpenUrlA(), HttpOpenRequestA() */ +void AsyncInternetReadFileExProc(WORKREQUEST *workRequest) +{ + struct WORKREQ_INTERNETREADFILEEXA const *req = &workRequest->u.InternetReadFileExA; + + TRACE("INTERNETREADFILEEXA %p\n", workRequest->hdr); + + INTERNET_ReadFile(workRequest->hdr, req->lpBuffersOut->lpvBuffer, + req->lpBuffersOut->dwBufferLength, + &req->lpBuffersOut->dwBufferLength, TRUE, TRUE); +} + BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOut, DWORD dwFlags, DWORD dwContext) { @@ -1844,7 +1855,8 @@ BOOL WINAPI InternetReadFileExA(HINTERNE WORKREQUEST workRequest; struct WORKREQ_INTERNETREADFILEEXA *req; - workRequest.asyncall = INTERNETREADFILEEXA; + workRequest.asyncall = CALLASYNCPROC; + workRequest.asyncproc = AsyncInternetReadFileExProc; workRequest.hdr = WININET_AddRef( lpwh ); req = &workRequest.u.InternetReadFileExA; req->lpBuffersOut = lpBuffersOut; @@ -3376,18 +3388,6 @@ static VOID INTERNET_ExecuteWork(void) FTP_FindNextFileW(lpwh, req->lpFindFileData); } break; - - case INTERNETREADFILEEXA: - { - struct WORKREQ_INTERNETREADFILEEXA *req = &workRequest.u.InternetReadFileExA; - - TRACE("INTERNETREADFILEEXA %p\n", workRequest.hdr); - - INTERNET_ReadFile(workRequest.hdr, req->lpBuffersOut->lpvBuffer, - req->lpBuffersOut->dwBufferLength, - &req->lpBuffersOut->dwBufferLength, TRUE, TRUE); - } - break; } WININET_Release( workRequest.hdr ); } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 989fb9a..ee9c2d6 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -261,7 +261,6 @@ typedef enum FTPREMOVEDIRECTORYW, FTPRENAMEFILEW, FTPFINDNEXTW, - INTERNETREADFILEEXA, } ASYNC_FUNC; struct WORKREQ_FTPPUTFILEW

1 0

Jacek Caban : wininet: Remove not used HTTPOPENREQUESTW request.
by Alexandre Julliard Dec. 26, 2006

Dec. 26, 2006

Module: wine Branch: master Commit: 5dd5536a9aafab7c02fa957fa29b95066b4f2299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dd5536a9aafab7c02fa957fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 25 21:33:43 2006 +0100 wininet: Remove not used HTTPOPENREQUESTW request. --- dlls/wininet/internet.c | 18 ------------------ dlls/wininet/internet.h | 13 ------------- 2 files changed, 0 insertions(+), 31 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index ab5c955..7a3d178 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3363,24 +3363,6 @@ static VOID INTERNET_ExecuteWork(void) } break; - case HTTPOPENREQUESTW: - { - struct WORKREQ_HTTPOPENREQUESTW *req = &workRequest.u.HttpOpenRequestW; - LPWININETHTTPSESSIONW lpwhs = (LPWININETHTTPSESSIONW) workRequest.hdr; - - TRACE("HTTPOPENREQUESTW %p\n", lpwhs); - - HTTP_HttpOpenRequestW(lpwhs, req->lpszVerb, - req->lpszObjectName, req->lpszVersion, req->lpszReferrer, - req->lpszAcceptTypes, req->dwFlags, req->dwContext); - - HeapFree(GetProcessHeap(), 0, req->lpszVerb); - HeapFree(GetProcessHeap(), 0, req->lpszObjectName); - HeapFree(GetProcessHeap(), 0, req->lpszVersion); - HeapFree(GetProcessHeap(), 0, req->lpszReferrer); - } - break; - case INTERNETOPENURLW: { struct WORKREQ_INTERNETOPENURLW *req = &workRequest.u.InternetOpenUrlW; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 9935aa6..7a86e4f 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -261,7 +261,6 @@ typedef enum FTPREMOVEDIRECTORYW, FTPRENAMEFILEW, FTPFINDNEXTW, - HTTPOPENREQUESTW, INTERNETOPENURLW, INTERNETREADFILEEXA, } ASYNC_FUNC; @@ -337,17 +336,6 @@ struct WORKREQ_FTPFINDNEXTW LPWIN32_FIND_DATAW lpFindFileData; }; -struct WORKREQ_HTTPOPENREQUESTW -{ - LPWSTR lpszVerb; - LPWSTR lpszObjectName; - LPWSTR lpszVersion; - LPWSTR lpszReferrer; - LPCWSTR *lpszAcceptTypes; - DWORD dwFlags; - DWORD dwContext; -}; - struct WORKREQ_HTTPSENDREQUESTW { LPWSTR lpszHeader; @@ -399,7 +387,6 @@ typedef struct WORKREQ struct WORKREQ_FTPREMOVEDIRECTORYW FtpRemoveDirectoryW; struct WORKREQ_FTPRENAMEFILEW FtpRenameFileW; struct WORKREQ_FTPFINDNEXTW FtpFindNextW; - struct WORKREQ_HTTPOPENREQUESTW HttpOpenRequestW; struct WORKREQ_HTTPSENDREQUESTW HttpSendRequestW; struct WORKREQ_SENDCALLBACK SendCallback; struct WORKREQ_INTERNETOPENURLW InternetOpenUrlW;

1 0

Jacek Caban : wininet: Use proc instead of enum in HTTPSENDREQUESTW request .
by Alexandre Julliard Dec. 26, 2006

Dec. 26, 2006

Module: wine Branch: master Commit: c156845560d9279a8e5c46029a45abe4f5afe267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c156845560d9279a8e5c46029… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 25 21:33:36 2006 +0100 wininet: Use proc instead of enum in HTTPSENDREQUESTW request. --- dlls/wininet/http.c | 23 +++++++++++++++++++---- dlls/wininet/internet.c | 15 --------------- dlls/wininet/internet.h | 1 - 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8327b8b..ff66390 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -180,6 +180,20 @@ static void HTTP_FreeTokens(LPWSTR * tok * Helper functions for the HttpSendRequest(Ex) functions * */ +static void AsyncHttpSendRequestProc(WORKREQUEST *workRequest) +{ + struct WORKREQ_HTTPSENDREQUESTW const *req = &workRequest->u.HttpSendRequestW; + LPWININETHTTPREQW lpwhr = (LPWININETHTTPREQW) workRequest->hdr; + + TRACE("%p\n", lpwhr); + + HTTP_HttpSendRequestW(lpwhr, req->lpszHeader, + req->dwHeaderLength, req->lpOptional, req->dwOptionalLength, + req->dwContentLength, req->bEndRequest); + + HeapFree(GetProcessHeap(), 0, req->lpszHeader); +} + static void HTTP_FixVerb( LPWININETHTTPREQW lpwhr ) { /* if the verb is NULL default to GET */ @@ -1778,7 +1792,8 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET WORKREQUEST workRequest; struct WORKREQ_HTTPSENDREQUESTW *req; - workRequest.asyncall = HTTPSENDREQUESTW; + workRequest.asyncall = CALLASYNCPROC; + workRequest.asyncproc = AsyncHttpSendRequestProc; workRequest.hdr = WININET_AddRef( &lpwhr->hdr ); req = &workRequest.u.HttpSendRequestW; if (lpBuffersIn) @@ -1873,8 +1888,9 @@ BOOL WINAPI HttpSendRequestW(HINTERNET h WORKREQUEST workRequest; struct WORKREQ_HTTPSENDREQUESTW *req; - workRequest.asyncall = HTTPSENDREQUESTW; - workRequest.hdr = WININET_AddRef( &lpwhr->hdr ); + workRequest.asyncall = CALLASYNCPROC; + workRequest.asyncproc = AsyncHttpSendRequestProc; + workRequest.hdr = WININET_AddRef( &lpwhr->hdr ); req = &workRequest.u.HttpSendRequestW; if (lpszHeaders) req->lpszHeader = WININET_strdupW(lpszHeaders); @@ -2351,7 +2367,6 @@ lend: return bSuccess; } - /*********************************************************************** * HTTP_Connect (internal) * diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index d5a4976..ab5c955 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3363,21 +3363,6 @@ static VOID INTERNET_ExecuteWork(void) } break; - case HTTPSENDREQUESTW: - { - struct WORKREQ_HTTPSENDREQUESTW *req = &workRequest.u.HttpSendRequestW; - LPWININETHTTPREQW lpwhr = (LPWININETHTTPREQW) workRequest.hdr; - - TRACE("HTTPSENDREQUESTW %p\n", lpwhr); - - HTTP_HttpSendRequestW(lpwhr, req->lpszHeader, - req->dwHeaderLength, req->lpOptional, req->dwOptionalLength, - req->dwContentLength, req->bEndRequest); - - HeapFree(GetProcessHeap(), 0, req->lpszHeader); - } - break; - case HTTPOPENREQUESTW: { struct WORKREQ_HTTPOPENREQUESTW *req = &workRequest.u.HttpOpenRequestW; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 6868b78..9935aa6 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -261,7 +261,6 @@ typedef enum FTPREMOVEDIRECTORYW, FTPRENAMEFILEW, FTPFINDNEXTW, - HTTPSENDREQUESTW, HTTPOPENREQUESTW, INTERNETOPENURLW, INTERNETREADFILEEXA,

1 0

Jacek Caban : wininet: Use proc instead of enum in SENDCALLBACK request.
by Alexandre Julliard Dec. 26, 2006

Dec. 26, 2006

Module: wine Branch: master Commit: e30037f0d5705040430ddef3d59df43a6e0d9c9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e30037f0d5705040430ddef3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 25 21:32:52 2006 +0100 wininet: Use proc instead of enum in SENDCALLBACK request. --- dlls/wininet/internet.c | 19 ++++--------------- dlls/wininet/internet.h | 3 ++- dlls/wininet/utility.c | 15 ++++++++++++++- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b96556e..d5a4976 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3213,6 +3213,10 @@ static VOID INTERNET_ExecuteWork(void) switch (workRequest.asyncall) { + case CALLASYNCPROC: + workRequest.asyncproc(&workRequest); + break; + case FTPPUTFILEW: { struct WORKREQ_FTPPUTFILEW *req = &workRequest.u.FtpPutFileW; @@ -3392,21 +3396,6 @@ static VOID INTERNET_ExecuteWork(void) } break; - case SENDCALLBACK: - { - struct WORKREQ_SENDCALLBACK *req = &workRequest.u.SendCallback; - - TRACE("SENDCALLBACK %p\n", workRequest.hdr); - - INTERNET_SendCallback(workRequest.hdr, - req->dwContext, req->dwInternetStatus, req->lpvStatusInfo, - req->dwStatusInfoLength); - - /* And frees the copy of the status info */ - HeapFree(GetProcessHeap(), 0, req->lpvStatusInfo); - } - break; - case INTERNETOPENURLW: { struct WORKREQ_INTERNETOPENURLW *req = &workRequest.u.InternetOpenUrlW; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 235e320..6868b78 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -249,6 +249,7 @@ typedef struct typedef enum { + CALLASYNCPROC, FTPPUTFILEW, FTPSETCURRENTDIRECTORYW, FTPCREATEDIRECTORYW, @@ -262,7 +263,6 @@ typedef enum FTPFINDNEXTW, HTTPSENDREQUESTW, HTTPOPENREQUESTW, - SENDCALLBACK, INTERNETOPENURLW, INTERNETREADFILEEXA, } ASYNC_FUNC; @@ -385,6 +385,7 @@ struct WORKREQ_INTERNETREADFILEEXA typedef struct WORKREQ { ASYNC_FUNC asyncall; + void (*asyncproc)(struct WORKREQ*); WININETHANDLEHEADER *hdr; union { diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 4f969f8..0269365 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -254,7 +254,19 @@ VOID INTERNET_SendCallback(LPWININETHAND HeapFree(GetProcessHeap(), 0, lpvNewInfo); } +static void SendAsyncCallbackProc(WORKREQUEST *workRequest) +{ + struct WORKREQ_SENDCALLBACK const *req = &workRequest->u.SendCallback; + + TRACE("%p\n", workRequest->hdr); + INTERNET_SendCallback(workRequest->hdr, + req->dwContext, req->dwInternetStatus, req->lpvStatusInfo, + req->dwStatusInfoLength); + + /* And frees the copy of the status info */ + HeapFree(GetProcessHeap(), 0, req->lpvStatusInfo); +} VOID SendAsyncCallback(LPWININETHANDLEHEADER hdr, DWORD dwContext, DWORD dwInternetStatus, LPVOID lpvStatusInfo, @@ -281,7 +293,8 @@ VOID SendAsyncCallback(LPWININETHANDLEHE memcpy(lpvStatusInfo_copy, lpvStatusInfo, dwStatusInfoLength); } - workRequest.asyncall = SENDCALLBACK; + workRequest.asyncall = CALLASYNCPROC; + workRequest.asyncproc = SendAsyncCallbackProc; workRequest.hdr = WININET_AddRef( hdr ); req = &workRequest.u.SendCallback; req->dwContext = dwContext;

1 0

H. Verbeet : wined3d: Restore texture bindings in the FBO code.
by Alexandre Julliard Dec. 26, 2006

Dec. 26, 2006

Module: wine Branch: master Commit: bf250285ff08b5c9c13935f232bdd04b0585d5c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf250285ff08b5c9c13935f23… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Dec 25 17:12:50 2006 +0100 wined3d: Restore texture bindings in the FBO code. --- dlls/wined3d/device.c | 8 ++++++-- dlls/wined3d/drawprim.c | 7 +++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f22b03d..4966d0c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5840,16 +5840,18 @@ static void set_depth_stencil_fbo(IWineD if (depth_stencil_impl) { GLenum texttarget, target; + GLint old_binding = 0; IWineD3DSurface_PreLoad(depth_stencil); texttarget = depth_stencil_impl->glDescription.target; target = texttarget == GL_TEXTURE_2D ? GL_TEXTURE_2D : GL_TEXTURE_CUBE_MAP_ARB; + glGetIntegerv(texttarget == GL_TEXTURE_2D ? GL_TEXTURE_BINDING_2D : GL_TEXTURE_BINDING_CUBE_MAP_ARB, &old_binding); glBindTexture(target, depth_stencil_impl->glDescription.textureName); glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(target, GL_DEPTH_TEXTURE_MODE_ARB, GL_LUMINANCE); - glBindTexture(target, 0); + glBindTexture(target, old_binding); GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, texttarget, depth_stencil_impl->glDescription.textureName, 0)); checkGLcall("glFramebufferTexture2DEXT()"); @@ -5876,15 +5878,17 @@ static void set_render_target_fbo(IWineD if (rtimpl) { GLenum texttarget, target; + GLint old_binding = 0; IWineD3DSurface_PreLoad(render_target); texttarget = rtimpl->glDescription.target; target = texttarget == GL_TEXTURE_2D ? GL_TEXTURE_2D : GL_TEXTURE_CUBE_MAP_ARB; + glGetIntegerv(texttarget == GL_TEXTURE_2D ? GL_TEXTURE_BINDING_2D : GL_TEXTURE_BINDING_CUBE_MAP_ARB, &old_binding); glBindTexture(target, rtimpl->glDescription.textureName); glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glBindTexture(target, 0); + glBindTexture(target, old_binding); GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT + idx, texttarget, rtimpl->glDescription.textureName, 0)); checkGLcall("glFramebufferTexture2DEXT()"); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index a1992c4..7e897f1 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1849,6 +1849,7 @@ static void check_fbo_status(IWineD3DDev static void depth_blt(IWineD3DDevice *iface, GLuint texture) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + GLint old_binding = 0; glPushAttrib(GL_ENABLE_BIT | GL_DEPTH_BUFFER_BIT); @@ -1860,6 +1861,7 @@ static void depth_blt(IWineD3DDevice *if glDepthFunc(GL_ALWAYS); GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); + glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_binding); glBindTexture(GL_TEXTURE_2D, texture); glEnable(GL_TEXTURE_2D); @@ -1872,6 +1874,8 @@ static void depth_blt(IWineD3DDevice *if glVertex2f(1.0f, 1.0f); glEnd(); + glBindTexture(GL_TEXTURE_2D, old_binding); + glPopAttrib(); } @@ -1887,6 +1891,7 @@ static void depth_copy(IWineD3DDevice *i if (This->render_offscreen) { static GLuint tmp_texture = 0; + GLint old_binding = 0; TRACE("Copying onscreen depth buffer to offscreen surface\n"); @@ -1897,6 +1902,7 @@ static void depth_copy(IWineD3DDevice *i /* Note that we use depth_blt here as well, rather than glCopyTexImage2D * directly on the FBO texture. That's because we need to flip. */ GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); + glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_binding); glBindTexture(GL_TEXTURE_2D, tmp_texture); glCopyTexImage2D(depth_stencil->glDescription.target, depth_stencil->glDescription.level, @@ -1909,6 +1915,7 @@ static void depth_copy(IWineD3DDevice *i glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_DEPTH_TEXTURE_MODE_ARB, GL_LUMINANCE); + glBindTexture(GL_TEXTURE_2D, old_binding); GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, This->fbo)); checkGLcall("glBindFramebuffer()");

1 0

H. Verbeet : wined3d: Copy the depth buffer after all dirty states are applied.
by Alexandre Julliard Dec. 26, 2006

Dec. 26, 2006

Module: wine Branch: master Commit: d6010edee074437335b1b75ce0c89e49a8458299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6010edee074437335b1b75ce… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Dec 25 17:12:45 2006 +0100 wined3d: Copy the depth buffer after all dirty states are applied. --- dlls/wined3d/drawprim.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index a050bb2..a1992c4 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1949,15 +1949,6 @@ void drawPrimitive(IWineD3DDevice *iface BOOL lighting_changed, lighting_original = FALSE; - if (TRACE_ON(d3d_draw) && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - check_fbo_status(iface); - } - - if (This->depth_copy_state == WINED3D_DCS_COPY) { - depth_copy(iface); - } - This->depth_copy_state = WINED3D_DCS_INITIAL; - /* Shaders can be implemented using ARB_PROGRAM, GLSL, or software - * here simply check whether a shader was set, or the user disabled shaders */ if (This->vs_selected_mode != SHADER_NONE && This->stateBlock->vertexShader && @@ -1990,6 +1981,15 @@ void drawPrimitive(IWineD3DDevice *iface } This->numDirtyEntries = 0; /* This makes the whole list clean */ + if (TRACE_ON(d3d_draw) && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + check_fbo_status(iface); + } + + if (This->depth_copy_state == WINED3D_DCS_COPY) { + depth_copy(iface); + } + This->depth_copy_state = WINED3D_DCS_INITIAL; + if(DrawPrimStrideData) { /* Note: this is a ddraw fixed-function code path */

1 0

Stefan Dösinger : wined3d: D3DRS_BLENDFACTOR should not influence glBlend(TRUE/FALSE).
by Alexandre Julliard Dec. 26, 2006

Dec. 26, 2006

Module: wine Branch: master Commit: d6245409de9efd47322fe9253af4ebe83301c0d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6245409de9efd47322fe9253… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Dec 25 18:46:59 2006 +0100 wined3d: D3DRS_BLENDFACTOR should not influence glBlend(TRUE/FALSE). --- dlls/wined3d/state.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6bf101c..27fd9f4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -208,14 +208,11 @@ static void state_ambient(DWORD state, I static void state_blend(DWORD state, IWineD3DStateBlockImpl *stateblock) { int srcBlend = GL_ZERO; int dstBlend = GL_ZERO; - float col[4]; /* GL_LINE_SMOOTH needs GL_BLEND to work, according to the red book, and special blending params */ - /* TODO: Is enabling blending really affected by the blendfactor??? */ if (stateblock->renderState[WINED3DRS_ALPHABLENDENABLE] || stateblock->renderState[WINED3DRS_EDGEANTIALIAS] || - stateblock->renderState[WINED3DRS_ANTIALIASEDLINEENABLE] || - stateblock->renderState[WINED3DRS_BLENDFACTOR] != 0xFFFFFFFF) { + stateblock->renderState[WINED3DRS_ANTIALIASEDLINEENABLE]) { glEnable(GL_BLEND); checkGLcall("glEnable GL_BLEND"); } else { @@ -303,6 +300,10 @@ static void state_blend(DWORD state, IWi /* TODO: Remove when state management done */ stateblock->wineD3DDevice->dstBlend = dstBlend; stateblock->wineD3DDevice->srcBlend = srcBlend; +} + +static void state_blendfactor(DWORD state, IWineD3DStateBlockImpl *stateblock) { + float col[4]; TRACE("Setting BlendFactor to %d\n", stateblock->renderState[WINED3DRS_BLENDFACTOR]); D3DCOLORTOGLFLOAT4(stateblock->renderState[WINED3DRS_BLENDFACTOR], col); @@ -1961,7 +1962,7 @@ const struct StateEntry StateTable[] = { /*190, WINED3DRS_COLORWRITEENABLE1 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, { /*191, WINED3DRS_COLORWRITEENABLE2 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, { /*192, WINED3DRS_COLORWRITEENABLE3 */ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, - { /*193, WINED3DRS_BLENDFACTOR */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_blend }, + { /*193, WINED3DRS_BLENDFACTOR */ STATE_RENDER(WINED3DRS_BLENDFACTOR), state_blendfactor }, { /*194, WINED3DRS_SRGBWRITEENABLE */ STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), state_srgbwrite }, { /*195, WINED3DRS_DEPTHBIAS */ STATE_RENDER(WINED3DRS_DEPTHBIAS), state_depthbias }, { /*196, undefined */ 0, state_undefined },

1 0

Stefan Dösinger : wined3d: Do not mark texture stages above MAX_TEXTURES dirty.
by Alexandre Julliard Dec. 26, 2006

Dec. 26, 2006

Module: wine Branch: master Commit: bc90458244adff31106a83b3ebeb2a96141ac299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc90458244adff31106a83b3e… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Dec 25 12:43:02 2006 +0100 wined3d: Do not mark texture stages above MAX_TEXTURES dirty. --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1c1abab..f22b03d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4593,7 +4593,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl ULONG bindCount = InterlockedIncrement(&new->baseTexture.bindCount); IWineD3DBaseTexture_AddRef(This->updateStateBlock->textures[Stage]); - if(oldTexture == NULL) { + if(oldTexture == NULL && Stage < MAX_TEXTURES) { /* The source arguments for color and alpha ops have different meanings when a NULL texture is bound, * so the COLOROP and ALPHAOP have to be dirtified. */ @@ -4612,7 +4612,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl LONG bindCount = InterlockedDecrement(&old->baseTexture.bindCount); IWineD3DBaseTexture_Release(oldTexture); - if(pTexture == NULL) { + if(pTexture == NULL && Stage < MAX_TEXTURES) { IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(Stage, WINED3DTSS_COLOROP)); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(Stage, WINED3DTSS_ALPHAOP)); }

1 0