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

Stefan Dösinger : wined3d: Fake occlusion queries if the wrong context is active.
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: e184b09a6601f448eb000ebd6dcd10874b2bef21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e184b09a6601f448eb000ebd6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 14 15:42:34 2007 +0200 wined3d: Fake occlusion queries if the wrong context is active. --- dlls/wined3d/device.c | 1 + dlls/wined3d/query.c | 26 +++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8509192..60f310a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1140,6 +1140,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, WINE TRACE("(%p) Allocating data for an occlusion query\n", This); object->extendedData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WineQueryOcclusionData)); GL_EXTCALL(glGenQueriesARB(1, &((WineQueryOcclusionData *)(object->extendedData))->queryId)); + ((WineQueryOcclusionData *)(object->extendedData))->ctx = This->activeContext; break; } case WINED3DQUERYTYPE_EVENT: diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index f787c78..7c91f2e 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -187,7 +187,9 @@ static HRESULT WINAPI IWineD3DQueryImpl_GetData(IWineD3DQuery* iface, void* pDa case WINED3DQUERYTYPE_OCCLUSION: { DWORD* data = pData; - if (GL_SUPPORT(ARB_OCCLUSION_QUERY)) { + if (GL_SUPPORT(ARB_OCCLUSION_QUERY) && + ((WineQueryOcclusionData *)This->extendedData)->ctx == This->wineD3DDevice->activeContext && + This->wineD3DDevice->activeContext->tid == GetCurrentThreadId()) { GLuint available; GLuint samples; GLuint queryId = ((WineQueryOcclusionData *)This->extendedData)->queryId; @@ -206,7 +208,7 @@ static HRESULT WINAPI IWineD3DQueryImpl_GetData(IWineD3DQuery* iface, void* pDa res = S_FALSE; } } else { - FIXME("(%p) : Occlusion queries not supported. Returning 1.\n", This); + WARN("(%p) : Occlusion queries not supported, or wrong context. Returning 1.\n", This); *data = 1; res = S_OK; } @@ -380,13 +382,19 @@ static HRESULT WINAPI IWineD3DQueryImpl_Issue(IWineD3DQuery* iface, DWORD dwIs switch (This->type) { case WINED3DQUERYTYPE_OCCLUSION: if (GL_SUPPORT(ARB_OCCLUSION_QUERY)) { - if (dwIssueFlags & WINED3DISSUE_BEGIN) { - GL_EXTCALL(glBeginQueryARB(GL_SAMPLES_PASSED_ARB, ((WineQueryOcclusionData *)This->extendedData)->queryId)); - checkGLcall("glBeginQuery()"); - } - if (dwIssueFlags & WINED3DISSUE_END) { - GL_EXTCALL(glEndQueryARB(GL_SAMPLES_PASSED_ARB)); - checkGLcall("glEndQuery()"); + WineD3DContext *ctx = ((WineQueryOcclusionData *)This->extendedData)->ctx; + + if(ctx != This->wineD3DDevice->activeContext || ctx->tid != GetCurrentThreadId()) { + WARN("Not the owning context, can't start query\n"); + } else { + if (dwIssueFlags & WINED3DISSUE_BEGIN) { + GL_EXTCALL(glBeginQueryARB(GL_SAMPLES_PASSED_ARB, ((WineQueryOcclusionData *)This->extendedData)->queryId)); + checkGLcall("glBeginQuery()"); + } + if (dwIssueFlags & WINED3DISSUE_END) { + GL_EXTCALL(glEndQueryARB(GL_SAMPLES_PASSED_ARB)); + checkGLcall("glEndQuery()"); + } } } else { FIXME("(%p) : Occlusion queries not supported\n", This); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 84e0480..0328780 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1460,6 +1460,7 @@ extern const IWineD3DQueryVtbl IWineD3DQuery_Vtbl; /* Datastructures for IWineD3DQueryImpl.extendedData */ typedef struct WineQueryOcclusionData { GLuint queryId; + WineD3DContext *ctx; } WineQueryOcclusionData; typedef struct WineQueryEventData {

1 0

Misha Koshelev : wininet: Separate connection closing from object destruction.
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: 0f117e568ff084b45f5be4b250dd0d5b53c4419b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f117e568ff084b45f5be4b25… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Aug 23 00:06:00 2007 -0500 wininet: Separate connection closing from object destruction. --- dlls/wininet/ftp.c | 6 ++++++ dlls/wininet/http.c | 10 ++++++---- dlls/wininet/internet.c | 6 ++++++ dlls/wininet/internet.h | 1 + 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index d9291c2..b0c36f9 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1121,6 +1121,7 @@ HINTERNET FTP_FtpOpenFileW(LPWININETFTPSESSIONW lpwfs, lpwh->hdr.dwFlags = dwFlags; lpwh->hdr.dwContext = dwContext; lpwh->hdr.dwRefCount = 1; + lpwh->hdr.close_connection = NULL; lpwh->hdr.destroy = FTP_CloseFileTransferHandle; lpwh->hdr.lpfnStatusCB = lpwfs->hdr.lpfnStatusCB; lpwh->nDataSocket = nDataSocket; @@ -1897,6 +1898,10 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, lpwfs->hdr.dwContext = dwContext; lpwfs->hdr.dwInternalFlags = dwInternalFlags; lpwfs->hdr.dwRefCount = 1; + /* FIXME: Native sends INTERNET_STATUS_CLOSING_CONNECTION and + * INTERNET_STATUS_CONNECTION_CLOSED, need an equivalent FTP_CloseConnection + * function */ + lpwfs->hdr.close_connection = NULL; lpwfs->hdr.destroy = FTP_CloseSessionHandle; lpwfs->hdr.lpfnStatusCB = hIC->hdr.lpfnStatusCB; lpwfs->download_in_progress = NULL; @@ -3006,6 +3011,7 @@ static HINTERNET FTP_ReceiveFileList(LPWININETFTPSESSIONW lpwfs, INT nSocket, LP lpwfn->hdr.htype = WH_HFTPFINDNEXT; lpwfn->hdr.dwContext = dwContext; lpwfn->hdr.dwRefCount = 1; + lpwfn->hdr.close_connection = NULL; lpwfn->hdr.destroy = FTP_CloseFindNextHandle; lpwfn->hdr.lpfnStatusCB = lpwfs->hdr.lpfnStatusCB; lpwfn->index = 1; /* Next index is 1 since we return index 0 */ diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b676f48..08be913 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -103,6 +103,7 @@ struct HttpAuthInfo BOOL finished; /* finished authenticating */ }; +static void HTTP_CloseConnection(LPWININETHANDLEHEADER hdr); static void HTTP_CloseHTTPRequestHandle(LPWININETHANDLEHEADER hdr); static void HTTP_CloseHTTPSessionHandle(LPWININETHANDLEHEADER hdr); static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr); @@ -1363,6 +1364,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, lpwhr->hdr.dwFlags = dwFlags; lpwhr->hdr.dwContext = dwContext; lpwhr->hdr.dwRefCount = 1; + lpwhr->hdr.close_connection = HTTP_CloseConnection; lpwhr->hdr.destroy = HTTP_CloseHTTPRequestHandle; lpwhr->hdr.lpfnStatusCB = lpwhs->hdr.lpfnStatusCB; lpwhr->hdr.dwInternalFlags = lpwhs->hdr.dwInternalFlags & INET_CALLBACKW; @@ -2816,6 +2818,7 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, lpwhs->hdr.dwContext = dwContext; lpwhs->hdr.dwInternalFlags = dwInternalFlags | (hIC->hdr.dwInternalFlags & INET_CALLBACKW); lpwhs->hdr.dwRefCount = 1; + lpwhs->hdr.close_connection = NULL; lpwhs->hdr.destroy = HTTP_CloseHTTPSessionHandle; lpwhs->hdr.lpfnStatusCB = hIC->hdr.lpfnStatusCB; @@ -3319,8 +3322,9 @@ static BOOL HTTP_ProcessHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field, LPCWSTR v * Close socket connection * */ -static VOID HTTP_CloseConnection(LPWININETHTTPREQW lpwhr) +static void HTTP_CloseConnection(LPWININETHANDLEHEADER hdr) { + LPWININETHTTPREQW lpwhr = (LPWININETHTTPREQW) hdr; LPWININETHTTPSESSIONW lpwhs = NULL; LPWININETAPPINFOW hIC = NULL; @@ -3380,7 +3384,7 @@ BOOL HTTP_FinishedReading(LPWININETHTTPREQW lpwhr) &dwBufferSize, NULL) || strcmpiW(szConnectionResponse, szKeepAlive)) { - HTTP_CloseConnection(lpwhr); + HTTP_CloseConnection(&lpwhr->hdr); } /* FIXME: store data in the URL cache here */ @@ -3403,8 +3407,6 @@ static void HTTP_CloseHTTPRequestHandle(LPWININETHANDLEHEADER hdr) WININET_Release(&lpwhr->lpHttpSession->hdr); - HTTP_CloseConnection(lpwhr); - HeapFree(GetProcessHeap(), 0, lpwhr->lpszPath); HeapFree(GetProcessHeap(), 0, lpwhr->lpszVerb); HeapFree(GetProcessHeap(), 0, lpwhr->lpszRawHeaders); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index d24eed3..4886f7c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -173,6 +173,11 @@ BOOL WININET_Release( LPWININETHANDLEHEADER info ) TRACE( "object %p refcount = %d\n", info, info->dwRefCount ); if( !info->dwRefCount ) { + if ( info->close_connection ) + { + TRACE( "closing connection %p\n", info); + info->close_connection( info ); + } TRACE( "destroying object %p\n", info); info->destroy( info ); } @@ -477,6 +482,7 @@ HINTERNET WINAPI InternetOpenW(LPCWSTR lpszAgent, DWORD dwAccessType, lpwai->hdr.htype = WH_HINIT; lpwai->hdr.dwFlags = dwFlags; lpwai->hdr.dwRefCount = 1; + lpwai->hdr.close_connection = NULL; lpwai->hdr.destroy = INTERNET_CloseHandle; lpwai->dwAccessType = dwAccessType; lpwai->lpszProxyUsername = NULL; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index d388b5b..42ade48 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -146,6 +146,7 @@ struct _WININETHANDLEHEADER DWORD dwError; DWORD dwInternalFlags; DWORD dwRefCount; + WININET_object_function close_connection; WININET_object_function destroy; INTERNET_STATUS_CALLBACK lpfnStatusCB; };

1 0

Misha Koshelev : wininet: Send INTERNET_STATUS_HANDLE_CLOSING when object is being destroyed as native does .
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: 2f3805a3bd27305e64e92bc3b828ab272a35a6ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3805a3bd27305e64e92bc3b… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Aug 23 00:06:26 2007 -0500 wininet: Send INTERNET_STATUS_HANDLE_CLOSING when object is being destroyed as native does. --- dlls/wininet/internet.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 4886f7c..9355500 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -178,6 +178,9 @@ BOOL WININET_Release( LPWININETHANDLEHEADER info ) TRACE( "closing connection %p\n", info); info->close_connection( info ); } + INTERNET_SendCallback(info, info->dwContext, + INTERNET_STATUS_HANDLE_CLOSING, &info->hInternet, + sizeof(HINTERNET)); TRACE( "destroying object %p\n", info); info->destroy( info ); } @@ -990,12 +993,6 @@ BOOL WINAPI InternetCloseHandle(HINTERNET hInternet) return FALSE; } - /* FIXME: native appears to send this from the equivalent of - * WININET_Release */ - INTERNET_SendCallback(lpwh, lpwh->dwContext, - INTERNET_STATUS_HANDLE_CLOSING, &hInternet, - sizeof(HINTERNET)); - WININET_FreeHandle( hInternet ); WININET_Release( lpwh );

1 0

Lei Zhang : gphoto2.ds: Add preview button and ability to disable import GUI.
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: e2605fb0ed517cc2ea03a18cb3f94bda5629321f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2605fb0ed517cc2ea03a18cb… Author: Lei Zhang <thestig(a)google.com> Date: Thu Aug 23 00:34:48 2007 -0700 gphoto2.ds: Add preview button and ability to disable import GUI. --- dlls/gphoto2.ds/Makefile.in | 2 +- dlls/gphoto2.ds/gphoto2_De.rc | 8 ++- dlls/gphoto2.ds/gphoto2_En.rc | 8 ++- dlls/gphoto2.ds/gphoto2_Fr.rc | 8 ++- dlls/gphoto2.ds/gphoto2_Ko.rc | 8 ++- dlls/gphoto2.ds/gphoto2_Nl.rc | 8 ++- dlls/gphoto2.ds/gphoto2_No.rc | 8 ++- dlls/gphoto2.ds/gphoto2_Pl.rc | 8 ++- dlls/gphoto2.ds/resource.h | 2 + dlls/gphoto2.ds/ui.c | 103 ++++++++++++++++++++++++++++------------- 10 files changed, 108 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2605fb0ed517cc2ea03a…

1 0

Stefan Dösinger : wined3d: Fall back to drawStridedSlow if fog coords are used.
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: 98bc83be7c1b24fdbebcd0b6e01cf4b936478a95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98bc83be7c1b24fdbebcd0b6e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 14 02:31:10 2007 +0200 wined3d: Fall back to drawStridedSlow if fog coords are used. --- dlls/wined3d/drawprim.c | 19 ++++++++++++++----- dlls/wined3d/state.c | 31 +++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 36 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 0d4f1e2..3a47912 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1050,13 +1050,22 @@ void drawPrimitive(IWineD3DDevice *iface, if (numberOfVertices == 0 ) numberOfVertices = calculatedNumberOfindices; - if(!This->strided_streams.u.s.position_transformed && !use_vs(This)) { - if(This->activeContext->num_untracked_materials && - This->stateBlock->renderState[WINED3DRS_LIGHTING]) { - IWineD3DVertexBufferImpl *vb; - + if(!use_vs(This)) { + if(!This->strided_streams.u.s.position_transformed && This->activeContext->num_untracked_materials && + This->stateBlock->renderState[WINED3DRS_LIGHTING]) { FIXME("Using software emulation because not all material properties could be tracked\n"); emulation = TRUE; + } + else if(This->activeContext->fog_coord && This->stateBlock->renderState[WINED3DRS_FOGENABLE]) { + /* Either write a pipeline replacement shader or convert the specular alpha from unsigned byte + * to a float in the vertex buffer + */ + FIXME("Using software emulation because manual fog coordinates are provided\n"); + emulation = TRUE; + } + + if(emulation) { + IWineD3DVertexBufferImpl *vb; strided = &stridedlcl; memcpy(&stridedlcl, &This->strided_streams, sizeof(stridedlcl)); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index fb060c5..20a7fa5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -803,9 +803,10 @@ static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo fogend = 0.0; } - if(GL_SUPPORT(EXT_FOG_COORD)) { + if(GL_SUPPORT(EXT_FOG_COORD) && context->fog_coord) { glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT); checkGLcall("glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT"); + context->fog_coord = FALSE; } context->last_was_foggy_shader = TRUE; } @@ -843,9 +844,10 @@ static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo default: FIXME("Unexpected WINED3DRS_FOGVERTEXMODE %d\n", stateblock->renderState[WINED3DRS_FOGVERTEXMODE]); } - if(GL_SUPPORT(EXT_FOG_COORD)) { + if(GL_SUPPORT(EXT_FOG_COORD) && context->fog_coord) { glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT); checkGLcall("glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT"); + context->fog_coord = FALSE; } } /* DX 7 sdk: "If both render states(vertex and table fog) are set to valid modes, @@ -862,9 +864,10 @@ static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo if(!context->last_was_rhw) { glFogi(GL_FOG_MODE, GL_EXP); checkGLcall("glFogi(GL_FOG_MODE, GL_EXP"); - if(GL_SUPPORT(EXT_FOG_COORD)) { + if(GL_SUPPORT(EXT_FOG_COORD) && context->fog_coord) { glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT); checkGLcall("glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT"); + context->fog_coord = FALSE; } break; } @@ -873,9 +876,10 @@ static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo if(!context->last_was_rhw) { glFogi(GL_FOG_MODE, GL_EXP2); checkGLcall("glFogi(GL_FOG_MODE, GL_EXP2"); - if(GL_SUPPORT(EXT_FOG_COORD)) { + if(GL_SUPPORT(EXT_FOG_COORD) && context->fog_coord) { glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT); checkGLcall("glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT"); + context->fog_coord = FALSE; } break; } @@ -884,9 +888,10 @@ static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo if(!context->last_was_rhw) { glFogi(GL_FOG_MODE, GL_LINEAR); checkGLcall("glFogi(GL_FOG_MODE, GL_LINEAR"); - if(GL_SUPPORT(EXT_FOG_COORD)) { + if(GL_SUPPORT(EXT_FOG_COORD) && context->fog_coord) { glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT); checkGLcall("glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT"); + context->fog_coord = FALSE; } break; } @@ -897,8 +902,11 @@ static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo * Same happens with Vertexfog on transformed vertices */ if(GL_SUPPORT(EXT_FOG_COORD)) { - glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FOG_COORDINATE_EXT); - checkGLcall("glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FOG_COORDINATE_EXT)\n"); + if(context->fog_coord == FALSE) { + glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FOG_COORDINATE_EXT); + checkGLcall("glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FOG_COORDINATE_EXT)\n"); + context->fog_coord = TRUE; + } glFogi(GL_FOG_MODE, GL_LINEAR); checkGLcall("glFogi(GL_FOG_MODE, GL_LINEAR)"); fogstart = 0xff; @@ -920,27 +928,30 @@ static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo case WINED3DFOG_EXP: glFogi(GL_FOG_MODE, GL_EXP); checkGLcall("glFogi(GL_FOG_MODE, GL_EXP"); - if(GL_SUPPORT(EXT_FOG_COORD)) { + if(GL_SUPPORT(EXT_FOG_COORD) && context->fog_coord) { glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT); checkGLcall("glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT"); + context->fog_coord = FALSE; } break; case WINED3DFOG_EXP2: glFogi(GL_FOG_MODE, GL_EXP2); checkGLcall("glFogi(GL_FOG_MODE, GL_EXP2"); - if(GL_SUPPORT(EXT_FOG_COORD)) { + if(GL_SUPPORT(EXT_FOG_COORD) && context->fog_coord) { glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT); checkGLcall("glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT"); + context->fog_coord = FALSE; } break; case WINED3DFOG_LINEAR: glFogi(GL_FOG_MODE, GL_LINEAR); checkGLcall("glFogi(GL_FOG_MODE, GL_LINEAR"); - if(GL_SUPPORT(EXT_FOG_COORD)) { + if(GL_SUPPORT(EXT_FOG_COORD) && context->fog_coord) { glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT); checkGLcall("glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT"); + context->fog_coord = FALSE; } break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 29bd24d..73d13cc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -518,6 +518,7 @@ struct WineD3DContext { GLenum untracked_materials[2]; BOOL last_was_blit, last_was_ckey; char texShaderBumpMap; + BOOL fog_coord; /* The actual opengl context */ HGLRC glCtx;

1 0

Stefan Dösinger : wined3d: Refuse to lock locked surfaces.
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: ea283d3cba942393c6c2d8864a6e02257f39327c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea283d3cba942393c6c2d8864… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 14 14:40:04 2007 +0200 wined3d: Refuse to lock locked surfaces. --- dlls/wined3d/surface.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 20ade5c..7e525c5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -673,6 +673,10 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED TRACE("(%p) : rect@%p flags(%08x), output lockedRect@%p, memory@%p\n", This, pRect, Flags, pLockedRect, This->resource.allocatedMemory); + if (This->Flags & SFLAG_LOCKED) { + WARN("Surface is already locked, returning D3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } if (!(This->Flags & SFLAG_LOCKABLE)) { /* Note: UpdateTextures calls CopyRects which calls this routine to populate the texture regions, and since the destination is an unlockable region we need

1 0

Misha Koshelev : wininet: Rename WININET_object_destructor to a more general WININET_object_function .
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: 4b2f9af998290446d918192d73393e23aa63584f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b2f9af998290446d918192d7… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Aug 23 00:04:13 2007 -0500 wininet: Rename WININET_object_destructor to a more general WININET_object_function. --- dlls/wininet/internet.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 6101aca..d388b5b 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -135,7 +135,7 @@ typedef enum struct _WININETHANDLEHEADER; typedef struct _WININETHANDLEHEADER WININETHANDLEHEADER, *LPWININETHANDLEHEADER; -typedef void (*WININET_object_destructor)( LPWININETHANDLEHEADER ); +typedef void (*WININET_object_function)( LPWININETHANDLEHEADER ); struct _WININETHANDLEHEADER { @@ -146,7 +146,7 @@ struct _WININETHANDLEHEADER DWORD dwError; DWORD dwInternalFlags; DWORD dwRefCount; - WININET_object_destructor destroy; + WININET_object_function destroy; INTERNET_STATUS_CALLBACK lpfnStatusCB; };

1 0

Mikolaj Zalewski : msvcrt: Test and fix _mbsinc/_mbsninc.
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: 9a2d605dd9799149be5a8950a2f867adac6fa0c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a2d605dd9799149be5a8950a… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Wed Aug 22 19:14:30 2007 -0700 msvcrt: Test and fix _mbsinc/_mbsninc. --- dlls/msvcrt/mbcs.c | 29 +++++++++++++++++------------ dlls/msvcrt/tests/string.c | 26 ++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 9c6d34c..718e387 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -27,6 +27,7 @@ #include "wine/unicode.h" #include "wine/debug.h" #include "msvcrt/mbctype.h" +#include "msvcrt/mbstring.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -335,10 +336,7 @@ unsigned char* CDECL _mbsdec(const unsigned char* start, const unsigned char* cu */ unsigned char* CDECL _mbsinc(const unsigned char* str) { - if(MSVCRT___mb_cur_max > 1 && MSVCRT_isleadbyte(*str)) - return (unsigned char*)str + 2; /* MB char */ - - return (unsigned char*)str + 1; /* ASCII CP or SB char */ + return (unsigned char *)(str + _mbclen(str)); } /********************************************************************* @@ -346,15 +344,22 @@ unsigned char* CDECL _mbsinc(const unsigned char* str) */ unsigned char* CDECL _mbsninc(const unsigned char* str, MSVCRT_size_t num) { - if(!str || num < 1) + if(!str) return NULL; - if(MSVCRT___mb_cur_max > 1) + + while (num > 0 && *str) { - while(num--) - str = _mbsinc(str); - return (unsigned char*)str; + if (_ismbblead(*str)) + { + if (!*(str+1)) + break; + str++; + } + str++; + num--; } - return (unsigned char*)str + num; /* ASCII CP */ + + return (unsigned char*)str; } /********************************************************************* @@ -1348,7 +1353,7 @@ MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* se /********************************************************************* * _mbsspnp (MSVCRT.@) */ -const unsigned char* CDECL _mbsspnp(const unsigned char* string, const unsigned char* set) +unsigned char* CDECL _mbsspnp(const unsigned char* string, const unsigned char* set) { const unsigned char *p, *q; @@ -1376,7 +1381,7 @@ const unsigned char* CDECL _mbsspnp(const unsigned char* string, const unsigned } if (*p == '\0') return NULL; - return p; + return (unsigned char *)p; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 698a3af..004d059 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -185,6 +185,7 @@ static void test_mbcp(void) unsigned char *mbstring2 = (unsigned char *)"\xb0\xb1\xb2\xb3Q\xb4\xb5"; /* correct string */ unsigned char *mbsonlylead = (unsigned char *)"\xb0\0\xb1\xb2"; unsigned char buf[16]; + int step; /* some two single-byte code pages*/ test_codepage(1252); @@ -252,6 +253,31 @@ static void test_mbcp(void) _mbsnbcpy(buf, mbsonlylead, 5); expect_bin(buf, "\0\0\0\0\0\xff", 6); + /* _mbsinc/mbsdec */ + step = _mbsinc(mbstring) - mbstring; + ok(step == 2, "_mbsinc adds %d (exp. 2)\n", step); + step = _mbsinc(&mbstring[2]) - &mbstring[2]; /* lead + invalid tail */ + ok(step == 2, "_mbsinc adds %d (exp. 2)\n", step); + + step = _mbsninc(mbsonlylead, 1) - mbsonlylead; + ok(step == 0, "_mbsninc adds %d (exp. 0)\n", step); + step = _mbsninc(mbsonlylead, 2) - mbsonlylead; /* lead + NUL byte + lead + char */ + ok(step == 0, "_mbsninc adds %d (exp. 0)\n", step); + step = _mbsninc(mbstring2, 0) - mbstring2; + ok(step == 0, "_mbsninc adds %d (exp. 2)\n", step); + step = _mbsninc(mbstring2, 1) - mbstring2; + ok(step == 2, "_mbsninc adds %d (exp. 2)\n", step); + step = _mbsninc(mbstring2, 2) - mbstring2; + ok(step == 4, "_mbsninc adds %d (exp. 4)\n", step); + step = _mbsninc(mbstring2, 3) - mbstring2; + ok(step == 5, "_mbsninc adds %d (exp. 5)\n", step); + step = _mbsninc(mbstring2, 4) - mbstring2; + ok(step == 7, "_mbsninc adds %d (exp. 7)\n", step); + step = _mbsninc(mbstring2, 5) - mbstring2; + ok(step == 7, "_mbsninc adds %d (exp. 7)\n", step); + step = _mbsninc(mbstring2, 17) - mbstring2; + ok(step == 7, "_mbsninc adds %d (exp. 7)\n", step); + /* functions that depend on locale codepage, not mbcp. * we hope the current locale to be SBCS because setlocale(LC_ALL, ".1252") seems not to work yet * (as of Wine 0.9.43)

1 0

Alexandre Julliard : winex11: Get rid of get_context_from_GLXContext.
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: 372492436a4aab973d32992770a0512068174ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=372492436a4aab973d3299277… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 12:52:57 2007 +0200 winex11: Get rid of get_context_from_GLXContext. --- dlls/winex11.drv/opengl.c | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 1e96b49..793bf72 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -547,14 +547,6 @@ static inline void free_context(Wine_GLContext *context) HeapFree(GetProcessHeap(), 0, context); } -static inline Wine_GLContext *get_context_from_GLXContext(GLXContext ctx) -{ - Wine_GLContext *ret; - if (!ctx) return NULL; - for (ret = context_list; ret; ret = ret->next) if (ctx == ret->ctx) break; - return ret; -} - static inline BOOL is_valid_context( Wine_GLContext *ctx ) { Wine_GLContext *ptr; @@ -1979,8 +1971,7 @@ static void WINAPI X11DRV_wglGetIntegerv(GLenum pname, GLint* params) { case GL_DEPTH_BITS: { - GLXContext gl_ctx = pglXGetCurrentContext(); - Wine_GLContext* ret = get_context_from_GLXContext(gl_ctx); + Wine_GLContext *ctx = NtCurrentTeb()->glContext; pglGetIntegerv(pname, params); /** @@ -1988,7 +1979,7 @@ static void WINAPI X11DRV_wglGetIntegerv(GLenum pname, GLint* params) * we only have the default wine desktop context, * so if we have only a 24 depth say we have 32 */ - if (NULL == ret && 24 == *params) { + if (!ctx && *params == 24) { *params = 32; } TRACE("returns GL_DEPTH_BITS as '%d'\n", *params); @@ -1996,10 +1987,9 @@ static void WINAPI X11DRV_wglGetIntegerv(GLenum pname, GLint* params) } case GL_ALPHA_BITS: { - GLXContext gl_ctx = pglXGetCurrentContext(); - Wine_GLContext* ret = get_context_from_GLXContext(gl_ctx); + Wine_GLContext *ctx = NtCurrentTeb()->glContext; - pglXGetFBConfigAttrib(gdi_display, ret->fmt->fbconfig, GLX_ALPHA_SIZE, params); + pglXGetFBConfigAttrib(gdi_display, ctx->fmt->fbconfig, GLX_ALPHA_SIZE, params); TRACE("returns GL_ALPHA_BITS as '%d'\n", *params); break; }

1 0

Alexandre Julliard : winex11: Properly update the hdc in the GL context.
by Alexandre Julliard 23 Aug '07

23 Aug '07

Module: wine Branch: master Commit: f36536f7ab422ee7073a4e02110e418b4eeeda6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f36536f7ab422ee7073a4e021… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 12:50:29 2007 +0200 winex11: Properly update the hdc in the GL context. --- dlls/winex11.drv/opengl.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 09a1d6a..1e96b49 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1662,6 +1662,7 @@ BOOL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { NtCurrentTeb()->glContext = ctx; if(ret) { + ctx->hdc = hdc; ctx->physDev = physDev; ctx->pReadDev = physDev; @@ -1712,6 +1713,7 @@ BOOL X11DRV_wglMakeContextCurrentARB(X11DRV_PDEVICE* pDrawDev, X11DRV_PDEVICE* p ctx->ctx = pglXCreateContext(gdi_display, ctx->vis, NULL, GetObjectType(pDrawDev->hdc) == OBJ_MEMDC ? False : True); TRACE(" created a delayed OpenGL context (%p)\n", ctx->ctx); } + ctx->hdc = pDrawDev->hdc; ctx->physDev = pDrawDev; ctx->pReadDev = pReadDev; ret = pglXMakeContextCurrent(gdi_display, d_draw, d_read, ctx->ctx); @@ -1749,7 +1751,7 @@ BOOL X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) { describeContext(org); if(org->vis) - org->ctx = pglXCreateContext(gdi_display, org->vis, NULL, GetObjectType(org->physDev->hdc) == OBJ_MEMDC ? False : True); + org->ctx = pglXCreateContext(gdi_display, org->vis, NULL, GetObjectType(org->hdc) == OBJ_MEMDC ? False : True); else /* Create a GLX Context for a pbuffer */ org->ctx = pglXCreateNewContext(gdi_display, org->fmt->fbconfig, org->fmt->render_type, NULL, True); wine_tsx11_unlock(); @@ -1760,7 +1762,7 @@ BOOL X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) { describeContext(dest); /* Create the destination context with display lists shared */ if(dest->vis) - dest->ctx = pglXCreateContext(gdi_display, dest->vis, org->ctx, GetObjectType(org->physDev->hdc) == OBJ_MEMDC ? False : True); + dest->ctx = pglXCreateContext(gdi_display, dest->vis, org->ctx, GetObjectType(org->hdc) == OBJ_MEMDC ? False : True); else /* Create a GLX Context for a pbuffer */ dest->ctx = pglXCreateNewContext(gdi_display, dest->fmt->fbconfig, dest->fmt->render_type, org->ctx, True); wine_tsx11_unlock();

1 0