March 2009 - Wine-Commits - list.winehq.org

Rob Shearman : rpcrt4: Re-use already registered endpoints for a protocol sequence.
by Alexandre Julliard March 26, 2009

March 26, 2009

Module: wine Branch: master Commit: 375c68a0435af54e97889d5bfbbe7ecdfbe2010b URL: http://source.winehq.org/git/wine.git/?a=commit;h=375c68a0435af54e97889d5bf… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Mar 26 13:35:36 2009 +0000 rpcrt4: Re-use already registered endpoints for a protocol sequence. Return RPC_S_INVALID_ENDPOINT_FORMAT if a NULL endpoint is passed into RpcServerUseProtseqEp{,Ex}{A,W}. --- dlls/rpcrt4/rpc_server.c | 49 ++++++++++++++++++++++++++++++++++++-- dlls/rpcrt4/tests/rpc_protseq.c | 2 - 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 12a525d..4a87bd0 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -566,11 +566,32 @@ static void RPCRT4_stop_listen(BOOL auto_listen) LeaveCriticalSection(&listen_cs); } +static BOOL RPCRT4_protseq_is_endpoint_registered(RpcServerProtseq *protseq, LPCSTR endpoint) +{ + RpcConnection *conn; + EnterCriticalSection(&protseq->cs); + for (conn = protseq->conn; conn; conn = conn->Next) + { + if (!endpoint || !strcmp(endpoint, conn->Endpoint)) + break; + } + LeaveCriticalSection(&protseq->cs); + return (conn != NULL); +} + static RPC_STATUS RPCRT4_use_protseq(RpcServerProtseq* ps, LPSTR endpoint) { RPC_STATUS status; - status = ps->ops->open_endpoint(ps, endpoint); + EnterCriticalSection(&ps->cs); + + if (RPCRT4_protseq_is_endpoint_registered(ps, endpoint)) + status = RPC_S_OK; + else + status = ps->ops->open_endpoint(ps, endpoint); + + LeaveCriticalSection(&ps->cs); + if (status != RPC_S_OK) return status; @@ -751,6 +772,9 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpExA( RPC_CSTR Protseq, UINT MaxCalls, RPC debugstr_a(szep), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); + if (!Endpoint) + return RPC_S_INVALID_ENDPOINT_FORMAT; + status = RPCRT4_get_or_create_serverprotseq(MaxCalls, RPCRT4_strdupA(szps), &ps); if (status != RPC_S_OK) return status; @@ -772,6 +796,9 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpExW( RPC_WSTR Protseq, UINT MaxCalls, RPC debugstr_w( Endpoint ), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); + if (!Endpoint) + return RPC_S_INVALID_ENDPOINT_FORMAT; + status = RPCRT4_get_or_create_serverprotseq(MaxCalls, RPCRT4_strdupWtoA(Protseq), &ps); if (status != RPC_S_OK) return status; @@ -787,8 +814,16 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpExW( RPC_WSTR Protseq, UINT MaxCalls, RPC */ RPC_STATUS WINAPI RpcServerUseProtseqA(RPC_CSTR Protseq, unsigned int MaxCalls, void *SecurityDescriptor) { + RPC_STATUS status; + RpcServerProtseq* ps; + TRACE("(Protseq == %s, MaxCalls == %d, SecurityDescriptor == ^%p)\n", debugstr_a((char*)Protseq), MaxCalls, SecurityDescriptor); - return RpcServerUseProtseqEpA(Protseq, MaxCalls, NULL, SecurityDescriptor); + + status = RPCRT4_get_or_create_serverprotseq(MaxCalls, RPCRT4_strdupA((const char *)Protseq), &ps); + if (status != RPC_S_OK) + return status; + + return RPCRT4_use_protseq(ps, NULL); } /*********************************************************************** @@ -796,8 +831,16 @@ RPC_STATUS WINAPI RpcServerUseProtseqA(RPC_CSTR Protseq, unsigned int MaxCalls, */ RPC_STATUS WINAPI RpcServerUseProtseqW(RPC_WSTR Protseq, unsigned int MaxCalls, void *SecurityDescriptor) { + RPC_STATUS status; + RpcServerProtseq* ps; + TRACE("Protseq == %s, MaxCalls == %d, SecurityDescriptor == ^%p)\n", debugstr_w(Protseq), MaxCalls, SecurityDescriptor); - return RpcServerUseProtseqEpW(Protseq, MaxCalls, NULL, SecurityDescriptor); + + status = RPCRT4_get_or_create_serverprotseq(MaxCalls, RPCRT4_strdupWtoA(Protseq), &ps); + if (status != RPC_S_OK) + return status; + + return RPCRT4_use_protseq(ps, NULL); } void RPCRT4_destroy_all_protseqs(void) diff --git a/dlls/rpcrt4/tests/rpc_protseq.c b/dlls/rpcrt4/tests/rpc_protseq.c index a4589d6..a9b98a0 100644 --- a/dlls/rpcrt4/tests/rpc_protseq.c +++ b/dlls/rpcrt4/tests/rpc_protseq.c @@ -46,7 +46,6 @@ static void test_RpcServerUseProtseq(void) /* show that RpcServerUseProtseqEp(..., NULL, ...) isn't the same as * RpcServerUseProtseq(...) */ status = RpcServerUseProtseqEp(ncalrpc, 0, NULL, NULL); - todo_wine ok(status == RPC_S_INVALID_ENDPOINT_FORMAT, "RpcServerUseProtseqEp with NULL endpoint should have failed with " "RPC_S_INVALID_ENDPOINT_FORMAT instead of %d\n", status); @@ -111,7 +110,6 @@ static void test_RpcServerUseProtseq(void) status = RpcServerInqBindings(&bindings); ok(status == RPC_S_OK, "RpcServerInqBindings failed with status %d\n", status); binding_count_after2 = bindings->Count; - todo_wine ok(binding_count_after2 == binding_count_after1, "bindings should have been re-used - after1: %u after2: %u\n", binding_count_after1, binding_count_after2);

1 0

Henri Verbeet : wined3d: Simplify IWineD3DDeviceImpl_ProcessVertices().
by Alexandre Julliard March 26, 2009

March 26, 2009

Module: wine Branch: master Commit: a7d612854750ec6a7e572d94851c0abc39a7d2ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7d612854750ec6a7e572d948… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 10:43:40 2009 +0100 wined3d: Simplify IWineD3DDeviceImpl_ProcessVertices(). --- dlls/wined3d/device.c | 40 +++++++++++++++++----------------------- 1 files changed, 17 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 73d1ac8..c0f0d85 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4680,30 +4680,24 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, * * Also get the start index in, but only loop over all elements if there's something to add at all. */ -#define FIXSRC(type) \ - if(strided.u.s.type.VBO) { \ - struct wined3d_buffer *vb = (struct wined3d_buffer *)This->stateBlock->streamSource[strided.u.s.type.streamNo]; \ - strided.u.s.type.VBO = 0; \ - strided.u.s.type.lpData = (BYTE *) ((unsigned long) strided.u.s.type.lpData + (unsigned long) vb->resource.allocatedMemory); \ - ENTER_GL(); \ - GL_EXTCALL(glDeleteBuffersARB(1, &vb->buffer_object)); \ - vb->buffer_object = 0; \ - LEAVE_GL(); \ - } \ - if(strided.u.s.type.lpData) { \ - strided.u.s.type.lpData += strided.u.s.type.dwStride * SrcStartIndex; \ - } - FIXSRC(position); - FIXSRC(blendWeights); - FIXSRC(blendMatrixIndices); - FIXSRC(normal); - FIXSRC(pSize); - FIXSRC(diffuse); - FIXSRC(specular); - for(i = 0; i < WINED3DDP_MAXTEXCOORD; i++) { - FIXSRC(texCoords[i]); - } -#undef FIXSRC + for (i = 0; i < (sizeof(strided.u.input) / sizeof(*strided.u.input)); ++i) + { + if (strided.u.input[i].VBO) + { + struct wined3d_buffer *vb = + (struct wined3d_buffer *)This->stateBlock->streamSource[strided.u.input[i].streamNo]; + strided.u.input[i].VBO = 0; + strided.u.input[i].lpData = (BYTE *)((unsigned long)strided.u.input[i].lpData + (unsigned long)vb->resource.allocatedMemory); + ENTER_GL(); + GL_EXTCALL(glDeleteBuffersARB(1, &vb->buffer_object)); + vb->buffer_object = 0; + LEAVE_GL(); + } + if (strided.u.input[i].lpData) + { + strided.u.input[i].lpData += strided.u.input[i].dwStride * SrcStartIndex; + } + } } return process_vertices_strided(This, DestIndex, VertexCount, &strided,

1 0

Rob Shearman : widl: Include the version number in the __WIDL__ preprocessor definition.
by Alexandre Julliard March 26, 2009

March 26, 2009

Module: wine Branch: master Commit: 0a8e3c39a1e05f47136c69671ff691dc02ae0a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a8e3c39a1e05f47136c69671… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Mar 26 13:31:25 2009 +0000 widl: Include the version number in the __WIDL__ preprocessor definition. --- tools/widl/widl.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 62b7ff5..cbc35b7 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -196,6 +196,36 @@ static char *dup_basename_token(const char *name, const char *ext) return ret; } +static void add_widl_version_define(void) +{ + unsigned int version; + const char *p = PACKAGE_VERSION; + + /* major */ + version = atoi(p) * 0x10000; + p = strchr(p, '.'); + + /* minor */ + if (p) + { + version += atoi(p + 1) * 0x100; + p = strchr(p + 1, '.'); + } + + /* build */ + if (p) + version += atoi(p + 1); + + if (version != 0) + { + char version_str[11]; + snprintf(version_str, sizeof(version_str), "0x%x", version); + wpp_add_define("__WIDL__", version_str); + } + else + wpp_add_define("__WIDL__", NULL); +} + /* clean things up when aborting on a signal */ static void exit_on_signal( int sig ) { @@ -596,7 +626,7 @@ int main(int argc,char *argv[]) if (do_client) client_token = dup_basename_token(client_name,"_c.c"); if (do_server) server_token = dup_basename_token(server_name,"_s.c"); - wpp_add_cmdline_define("__WIDL__"); + add_widl_version_define(); atexit(rm_tempfile); if (!no_preprocess)

1 0

Henri Verbeet : wined3d: Pass the number of components to glVertexBlendARB( ).
by Alexandre Julliard March 26, 2009

March 26, 2009

Module: wine Branch: master Commit: c0c1c42288f0a78abf2bd24808411772f25d6580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c1c42288f0a78abf2bd2480… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 10:43:41 2009 +0100 wined3d: Pass the number of components to glVertexBlendARB(). --- dlls/wined3d/state.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ab18459..b4e5642 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4026,13 +4026,13 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, const WineDirect3 (sd->u.s.blendMatrixIndices.lpData) || (sd->u.s.blendMatrixIndices.VBO) ) { if (GL_SUPPORT(ARB_VERTEX_BLEND)) { - TRACE("Blend %d %p %d\n", WINED3D_ATR_FORMAT(sd->u.s.blendWeights.dwType), + TRACE("Blend %d %p %d\n", WINED3D_ATR_SIZE(sd->u.s.blendWeights.dwType), sd->u.s.blendWeights.lpData + stateblock->loadBaseVertexIndex * sd->u.s.blendWeights.dwStride, sd->u.s.blendWeights.dwStride + offset[sd->u.s.blendWeights.streamNo]); glEnableClientState(GL_WEIGHT_ARRAY_ARB); checkGLcall("glEnableClientState(GL_WEIGHT_ARRAY_ARB)"); - GL_EXTCALL(glVertexBlendARB(WINED3D_ATR_FORMAT(sd->u.s.blendWeights.dwType) + 1)); + GL_EXTCALL(glVertexBlendARB(WINED3D_ATR_SIZE(sd->u.s.blendWeights.dwType) + 1)); VTRACE(("glWeightPointerARB(%d, GL_FLOAT, %d, %p)\n", WINED3D_ATR_FORMAT(sd->u.s.blendWeights.dwType) ,

1 0

Henri Verbeet : wined3d: Simplify remove_vbos().
by Alexandre Julliard March 26, 2009

March 26, 2009

Module: wine Branch: master Commit: c1a42ff0243e70263e5d7f0d8f54e0988cb55a84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a42ff0243e70263e5d7f0d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 10:43:40 2009 +0100 wined3d: Simplify remove_vbos(). --- dlls/wined3d/drawprim.c | 51 ++++++++-------------------------------------- 1 files changed, 9 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index e408696..4718969 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -681,49 +681,16 @@ static inline void drawStridedInstanced(IWineD3DDevice *iface, const WineDirect3 } static inline void remove_vbos(IWineD3DDeviceImpl *This, WineDirect3DVertexStridedData *s) { - unsigned char i; - struct wined3d_buffer *vb; + unsigned int i; - if(s->u.s.position.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.position.streamNo]; - s->u.s.position.VBO = 0; - s->u.s.position.lpData = (BYTE *) ((unsigned long) s->u.s.position.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.blendWeights.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.blendWeights.streamNo]; - s->u.s.blendWeights.VBO = 0; - s->u.s.blendWeights.lpData = (BYTE *) ((unsigned long) s->u.s.blendWeights.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.blendMatrixIndices.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.blendMatrixIndices.streamNo]; - s->u.s.blendMatrixIndices.VBO = 0; - s->u.s.blendMatrixIndices.lpData = (BYTE *) ((unsigned long) s->u.s.blendMatrixIndices.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.normal.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.normal.streamNo]; - s->u.s.normal.VBO = 0; - s->u.s.normal.lpData = (BYTE *) ((unsigned long) s->u.s.normal.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.pSize.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.pSize.streamNo]; - s->u.s.pSize.VBO = 0; - s->u.s.pSize.lpData = (BYTE *) ((unsigned long) s->u.s.pSize.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.diffuse.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.diffuse.streamNo]; - s->u.s.diffuse.VBO = 0; - s->u.s.diffuse.lpData = (BYTE *) ((unsigned long) s->u.s.diffuse.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.specular.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.specular.streamNo]; - s->u.s.specular.VBO = 0; - s->u.s.specular.lpData = (BYTE *) ((unsigned long) s->u.s.specular.lpData + (unsigned long) vb->resource.allocatedMemory); - } - for(i = 0; i < WINED3DDP_MAXTEXCOORD; i++) { - if(s->u.s.texCoords[i].VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.texCoords[i].streamNo]; - s->u.s.texCoords[i].VBO = 0; - s->u.s.texCoords[i].lpData = (BYTE *) ((unsigned long) s->u.s.texCoords[i].lpData + (unsigned long) vb->resource.allocatedMemory); + for (i = 0; i < (sizeof(s->u.input) / sizeof(*s->u.input)); ++i) + { + if (s->u.input[i].VBO) + { + struct wined3d_buffer *vb = + (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.input[i].streamNo]; + s->u.input[i].VBO = 0; + s->u.input[i].lpData = (BYTE *)((unsigned long)s->u.input[i].lpData + (unsigned long)vb->resource.allocatedMemory); } } }

1 0

Henri Verbeet : wined3d: Remove unused attributes from WineDirect3DVertexStridedData.
by Alexandre Julliard March 26, 2009

March 26, 2009

Module: wine Branch: master Commit: 6afd97cc9f15e211f6cf81d15630ce3b450645cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6afd97cc9f15e211f6cf81d15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 10:43:39 2009 +0100 wined3d: Remove unused attributes from WineDirect3DVertexStridedData. These are essentially unused, and mostly just complicate the code. --- dlls/wined3d/device.c | 8 ------ dlls/wined3d/drawprim.c | 56 ---------------------------------------------- dlls/wined3d/state.c | 22 ------------------ include/wine/wined3d.idl | 9 ------- 4 files changed, 0 insertions(+), 95 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9c7e6ca..73d1ac8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4703,14 +4703,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, for(i = 0; i < WINED3DDP_MAXTEXCOORD; i++) { FIXSRC(texCoords[i]); } - FIXSRC(position2); - FIXSRC(normal2); - FIXSRC(tangent); - FIXSRC(binormal); - FIXSRC(tessFactor); - FIXSRC(fog); - FIXSRC(depth); - FIXSRC(sample); #undef FIXSRC } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 3f61b8a..e408696 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -57,22 +57,6 @@ static BOOL fixed_get_input( *regnum = 6; else if (usage == WINED3DDECLUSAGE_TEXCOORD && usage_idx < WINED3DDP_MAXTEXCOORD) *regnum = 7 + usage_idx; - else if ((usage == WINED3DDECLUSAGE_POSITION || usage == WINED3DDECLUSAGE_POSITIONT) && usage_idx == 1) - *regnum = 7 + WINED3DDP_MAXTEXCOORD; - else if (usage == WINED3DDECLUSAGE_NORMAL && usage_idx == 1) - *regnum = 8 + WINED3DDP_MAXTEXCOORD; - else if (usage == WINED3DDECLUSAGE_TANGENT && usage_idx == 0) - *regnum = 9 + WINED3DDP_MAXTEXCOORD; - else if (usage == WINED3DDECLUSAGE_BINORMAL && usage_idx == 0) - *regnum = 10 + WINED3DDP_MAXTEXCOORD; - else if (usage == WINED3DDECLUSAGE_TESSFACTOR && usage_idx == 0) - *regnum = 11 + WINED3DDP_MAXTEXCOORD; - else if (usage == WINED3DDECLUSAGE_FOG && usage_idx == 0) - *regnum = 12 + WINED3DDP_MAXTEXCOORD; - else if (usage == WINED3DDECLUSAGE_DEPTH && usage_idx == 0) - *regnum = 13 + WINED3DDP_MAXTEXCOORD; - else if (usage == WINED3DDECLUSAGE_SAMPLE && usage_idx == 0) - *regnum = 14 + WINED3DDP_MAXTEXCOORD; if (*regnum == -1) { FIXME("Unsupported input stream [usage=%s, usage_idx=%u]\n", @@ -742,46 +726,6 @@ static inline void remove_vbos(IWineD3DDeviceImpl *This, WineDirect3DVertexStrid s->u.s.texCoords[i].lpData = (BYTE *) ((unsigned long) s->u.s.texCoords[i].lpData + (unsigned long) vb->resource.allocatedMemory); } } - if(s->u.s.position2.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.position2.streamNo]; - s->u.s.position2.VBO = 0; - s->u.s.position2.lpData = (BYTE *) ((unsigned long) s->u.s.position2.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.normal2.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.normal2.streamNo]; - s->u.s.normal2.VBO = 0; - s->u.s.normal2.lpData = (BYTE *) ((unsigned long) s->u.s.normal2.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.tangent.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.tangent.streamNo]; - s->u.s.tangent.VBO = 0; - s->u.s.tangent.lpData = (BYTE *) ((unsigned long) s->u.s.tangent.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.binormal.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.binormal.streamNo]; - s->u.s.binormal.VBO = 0; - s->u.s.binormal.lpData = (BYTE *) ((unsigned long) s->u.s.binormal.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.tessFactor.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.tessFactor.streamNo]; - s->u.s.tessFactor.VBO = 0; - s->u.s.tessFactor.lpData = (BYTE *) ((unsigned long) s->u.s.tessFactor.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.fog.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.fog.streamNo]; - s->u.s.fog.VBO = 0; - s->u.s.fog.lpData = (BYTE *) ((unsigned long) s->u.s.fog.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.depth.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.depth.streamNo]; - s->u.s.depth.VBO = 0; - s->u.s.depth.lpData = (BYTE *) ((unsigned long) s->u.s.depth.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.sample.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.sample.streamNo]; - s->u.s.sample.VBO = 0; - s->u.s.sample.lpData = (BYTE *) ((unsigned long) s->u.s.sample.lpData + (unsigned long) vb->resource.allocatedMemory); - } } /* Routine common to the draw primitive and draw indexed primitive routines */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 55f2ff4..6035c71 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4243,14 +4243,6 @@ static inline void drawPrimitiveTraceDataLocations(const WineDirect3DVertexStrid TRACE_STRIDED((dataLocations), texCoords[5]); TRACE_STRIDED((dataLocations), texCoords[6]); TRACE_STRIDED((dataLocations), texCoords[7]); - TRACE_STRIDED((dataLocations), position2); - TRACE_STRIDED((dataLocations), normal2); - TRACE_STRIDED((dataLocations), tangent); - TRACE_STRIDED((dataLocations), binormal); - TRACE_STRIDED((dataLocations), tessFactor); - TRACE_STRIDED((dataLocations), fog); - TRACE_STRIDED((dataLocations), depth); - TRACE_STRIDED((dataLocations), sample); return; } @@ -4333,20 +4325,6 @@ static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo loadVertexData(stateblock, dataLocations); context->namedArraysLoaded = TRUE; } - -/* Generate some fixme's if unsupported functionality is being used */ -#define BUFFER_OR_DATA(_attribute) dataLocations->u.s._attribute.lpData - /* TODO: Either support missing functionality in fixupVertices or by creating a shader to replace the pipeline. */ - if (!useVertexShaderFunction && (BUFFER_OR_DATA(position2) || BUFFER_OR_DATA(normal2))) { - FIXME("Tweening is only valid with vertex shaders\n"); - } - if (!useVertexShaderFunction && BUFFER_OR_DATA(binormal)) { - FIXME("Binormal bump mapping is only valid with vertex shaders\n"); - } - if (!useVertexShaderFunction && (BUFFER_OR_DATA(tessFactor) || BUFFER_OR_DATA(fog) || BUFFER_OR_DATA(depth) || BUFFER_OR_DATA(sample))) { - FIXME("Extended attributes are only valid with vertex shaders\n"); - } -#undef BUFFER_OR_DATA } static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 5d502f1..4cf9159 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -1945,15 +1945,6 @@ typedef struct WineDirect3DVertexStridedData WineDirect3DStridedData diffuse; WineDirect3DStridedData specular; WineDirect3DStridedData texCoords[WINED3DDP_MAXTEXCOORD]; - WineDirect3DStridedData position2; /* tween data */ - WineDirect3DStridedData normal2; /* tween data */ - WineDirect3DStridedData tangent; - WineDirect3DStridedData binormal; - WineDirect3DStridedData tessFactor; - WineDirect3DStridedData fog; - WineDirect3DStridedData depth; - WineDirect3DStridedData sample; - /* Add fields here */ } s; WineDirect3DStridedData input[16]; /* Indexed by constants in D3DVSDE_REGISTER */

1 0

Alexandre Julliard : include: Get rid of the definitions for the pthread emulation.
by Alexandre Julliard March 26, 2009

March 26, 2009

Module: wine Branch: master Commit: 4aa98e030e352f020f401b3173ecd1a241e57ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aa98e030e352f020f401b317… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 26 13:26:57 2009 +0100 include: Get rid of the definitions for the pthread emulation. --- configure | 214 ------------------------------------------------ configure.ac | 4 - include/config.h.in | 6 -- include/wine/pthread.h | 51 ------------ loader/pthread.c | 6 ++ 5 files changed, 6 insertions(+), 275 deletions(-) diff --git a/configure b/configure index 3bf72df..a97f33e 100755 --- a/configure +++ b/configure @@ -15227,220 +15227,6 @@ _ACEOF fi -{ $as_echo "$as_me:$LINENO: checking for pthread_rwlock_t" >&5 -$as_echo_n "checking for pthread_rwlock_t... " >&6; } -if test "${ac_cv_type_pthread_rwlock_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_type_pthread_rwlock_t=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define _GNU_SOURCE -#include <pthread.h> - -int -main () -{ -if (sizeof (pthread_rwlock_t)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define _GNU_SOURCE -#include <pthread.h> - -int -main () -{ -if (sizeof ((pthread_rwlock_t))) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_pthread_rwlock_t=yes -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pthread_rwlock_t" >&5 -$as_echo "$ac_cv_type_pthread_rwlock_t" >&6; } -if test "x$ac_cv_type_pthread_rwlock_t" = x""yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_PTHREAD_RWLOCK_T 1 -_ACEOF - - -fi -{ $as_echo "$as_me:$LINENO: checking for pthread_rwlockattr_t" >&5 -$as_echo_n "checking for pthread_rwlockattr_t... " >&6; } -if test "${ac_cv_type_pthread_rwlockattr_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_type_pthread_rwlockattr_t=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define _GNU_SOURCE -#include <pthread.h> - -int -main () -{ -if (sizeof (pthread_rwlockattr_t)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define _GNU_SOURCE -#include <pthread.h> - -int -main () -{ -if (sizeof ((pthread_rwlockattr_t))) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_pthread_rwlockattr_t=yes -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pthread_rwlockattr_t" >&5 -$as_echo "$ac_cv_type_pthread_rwlockattr_t" >&6; } -if test "x$ac_cv_type_pthread_rwlockattr_t" = x""yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_PTHREAD_RWLOCKATTR_T 1 -_ACEOF - - -fi - - ac_wine_check_funcs_save_LIBS="$LIBS" LIBS="$LIBS $LIBPTHREAD" diff --git a/configure.ac b/configure.ac index 6a60c9e..c13abc4 100644 --- a/configure.ac +++ b/configure.ac @@ -1151,10 +1151,6 @@ then AC_DEFINE(HAVE_PPDEV, 1, [Define if we can use ppdev.h for parallel port access]) fi -dnl **** Check for pthread_rwlock_t **** -AC_CHECK_TYPES([pthread_rwlock_t, pthread_rwlockattr_t],,,[#define _GNU_SOURCE -#include <pthread.h>]) - dnl **** Check for pthread functions **** WINE_CHECK_LIB_FUNCS(\ pthread_attr_get_np \ diff --git a/include/config.h.in b/include/config.h.in index 047e90c..9e93513 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -594,12 +594,6 @@ /* Define to 1 if you have the <pthread_np.h> header file. */ #undef HAVE_PTHREAD_NP_H -/* Define to 1 if the system has the type `pthread_rwlockattr_t'. */ -#undef HAVE_PTHREAD_RWLOCKATTR_T - -/* Define to 1 if the system has the type `pthread_rwlock_t'. */ -#undef HAVE_PTHREAD_RWLOCK_T - /* Define to 1 if you have the <pwd.h> header file. */ #undef HAVE_PWD_H diff --git a/include/wine/pthread.h b/include/wine/pthread.h index a8d5ba3..561c22c 100644 --- a/include/wine/pthread.h +++ b/include/wine/pthread.h @@ -30,57 +30,6 @@ struct sigset_t; typedef struct sigset_t sigset_t; #endif -#ifdef HAVE_PTHREAD_H - -#define _GNU_SOURCE -#include <pthread.h> -#ifdef HAVE_PTHREAD_NP_H -#include <pthread_np.h> -#endif - -#ifndef HAVE_PTHREAD_RWLOCK_T -typedef void *pthread_rwlock_t; -#endif -#ifndef HAVE_PTHREAD_RWLOCKATTR_T -typedef void *pthread_rwlockattr_t; -#endif - -struct wine_pthread_callbacks -{ - void * (*ptr_get_thread_data)(void); - void (*ptr_set_thread_data)(void *data); - pthread_t (*ptr_pthread_self)(void); - int (*ptr_pthread_equal)(pthread_t thread1, pthread_t thread2); - int (*ptr_pthread_create)(pthread_t* thread, const pthread_attr_t* attr, - void* (*start_routine)(void *), void* arg); - int (*ptr_pthread_cancel)(pthread_t thread); - int (*ptr_pthread_join)(pthread_t thread, void **value_ptr); - int (*ptr_pthread_detach)(pthread_t thread); - void (*ptr_pthread_exit)(void *retval, char *currentframe); - int (*ptr_pthread_mutex_init)(pthread_mutex_t *mutex, const pthread_mutexattr_t *mutexattr); - int (*ptr_pthread_mutex_lock)(pthread_mutex_t *mutex); - int (*ptr_pthread_mutex_trylock)(pthread_mutex_t *mutex); - int (*ptr_pthread_mutex_unlock)(pthread_mutex_t *mutex); - int (*ptr_pthread_mutex_destroy)(pthread_mutex_t *mutex); - int (*ptr_pthread_rwlock_init)(pthread_rwlock_t *rwlock, - const pthread_rwlockattr_t *rwlock_attr); - int (*ptr_pthread_rwlock_destroy)(pthread_rwlock_t *rwlock); - int (*ptr_pthread_rwlock_rdlock)(pthread_rwlock_t *rwlock); - int (*ptr_pthread_rwlock_tryrdlock)(pthread_rwlock_t *rwlock); - int (*ptr_pthread_rwlock_wrlock)(pthread_rwlock_t *rwlock); - int (*ptr_pthread_rwlock_trywrlock)(pthread_rwlock_t *rwlock); - int (*ptr_pthread_rwlock_unlock)(pthread_rwlock_t *rwlock); - int (*ptr_pthread_cond_init)(pthread_cond_t *cond, const pthread_condattr_t *cond_attr); - int (*ptr_pthread_cond_destroy)(pthread_cond_t *cond); - int (*ptr_pthread_cond_signal)(pthread_cond_t *cond); - int (*ptr_pthread_cond_broadcast)(pthread_cond_t *cond); - int (*ptr_pthread_cond_wait)(pthread_cond_t *cond, pthread_mutex_t *mutex); - int (*ptr_pthread_cond_timedwait)(pthread_cond_t *cond, pthread_mutex_t *mutex, - const struct timespec *abstime); -}; - -#endif /* HAVE_PTHREAD_H */ - /* thread information used to creating and exiting threads */ struct wine_pthread_thread_info { diff --git a/loader/pthread.c b/loader/pthread.c index 4c0c892..e4e0831 100644 --- a/loader/pthread.c +++ b/loader/pthread.c @@ -39,6 +39,12 @@ #include <sys/ucontext.h> #include <sys/thr.h> #endif +#ifdef HAVE_PTHREAD_H +#include <pthread.h> +#endif +#ifdef HAVE_PTHREAD_NP_H +#include <pthread_np.h> +#endif #include "wine/library.h" #include "wine/pthread.h"

1 0

Henri Verbeet : d3d9: Fix some indentation.
by Alexandre Julliard March 26, 2009

March 26, 2009

Module: wine Branch: master Commit: db9bd91893a9c9649930054c7a20f29a3ebbcb49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db9bd91893a9c9649930054c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 10:43:38 2009 +0100 d3d9: Fix some indentation. --- dlls/d3d9/tests/device.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index a0597f5..84b68cb 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -740,7 +740,7 @@ static void test_reset(void) d3dpp.Windowed = FALSE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; d3dpp.EnableAutoDepthStencil = TRUE; d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8; @@ -804,7 +804,7 @@ static void test_reset(void) d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = FALSE; d3dpp.BackBufferWidth = 640; - d3dpp.BackBufferHeight = 480; + d3dpp.BackBufferHeight = 480; d3dpp.BackBufferFormat = d3ddm.Format; hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %08x\n", hr); @@ -848,7 +848,7 @@ static void test_reset(void) d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = TRUE; d3dpp.BackBufferWidth = 400; - d3dpp.BackBufferHeight = 300; + d3dpp.BackBufferHeight = 300; hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %08x\n", hr); hr = IDirect3DDevice9_TestCooperativeLevel(pDevice); @@ -891,7 +891,7 @@ static void test_reset(void) d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = TRUE; d3dpp.BackBufferWidth = 400; - d3dpp.BackBufferHeight = 300; + d3dpp.BackBufferHeight = 300; /* _Reset fails if there is a resource in the default pool */ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(pDevice, 16, 16, D3DFMT_R5G6B5, D3DPOOL_DEFAULT, &surface, NULL); @@ -1006,7 +1006,7 @@ static void test_reset(void) d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = FALSE; d3dpp.BackBufferWidth = 32; - d3dpp.BackBufferHeight = 32; + d3dpp.BackBufferHeight = 32; hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_Reset to w=32, h=32, windowed=FALSE failed with %08x\n", hr); hr = IDirect3DDevice9_TestCooperativeLevel(pDevice); @@ -1016,7 +1016,7 @@ static void test_reset(void) d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = FALSE; d3dpp.BackBufferWidth = 801; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_Reset to w=801, h=600, windowed=FALSE failed with %08x\n", hr); hr = IDirect3DDevice9_TestCooperativeLevel(pDevice); @@ -1141,7 +1141,7 @@ static void test_scene(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; d3dpp.EnableAutoDepthStencil = TRUE; d3dpp.AutoDepthStencilFormat = D3DFMT_D16; @@ -1294,7 +1294,7 @@ static void test_limits(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; d3dpp.EnableAutoDepthStencil = TRUE; d3dpp.AutoDepthStencilFormat = D3DFMT_D16; @@ -1362,7 +1362,7 @@ static void test_depthstenciltest(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; d3dpp.EnableAutoDepthStencil = TRUE; d3dpp.AutoDepthStencilFormat = D3DFMT_D16; @@ -1431,7 +1431,7 @@ static void test_depthstenciltest(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; d3dpp.EnableAutoDepthStencil = FALSE; d3dpp.AutoDepthStencilFormat = D3DFMT_UNKNOWN; @@ -1465,7 +1465,7 @@ static void test_depthstenciltest(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; d3dpp.EnableAutoDepthStencil = FALSE; d3dpp.AutoDepthStencilFormat = D3DFMT_D16;

1 0

Alexandre Julliard : msi/tests: Avoid size_t in traces.
by Alexandre Julliard March 26, 2009

March 26, 2009

Module: wine Branch: master Commit: 836d9af1be1fea9c66e7b8418dda33f989ecedb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=836d9af1be1fea9c66e7b8418… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 26 14:01:26 2009 +0100 msi/tests: Avoid size_t in traces. --- dlls/msi/tests/msi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 1c843ef..928e48a 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -7771,7 +7771,7 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid ok(context == MSIINSTALLCONTEXT_USERMANAGED, "Expected MSIINSTALLCONTEXT_USERMANAGED, got %d\n", context); ok(size == lstrlenA(expectedsid) * sizeof(WCHAR), - "Expected %d, got %d\n", lstrlenA(expectedsid) * sizeof(WCHAR), size); + "Expected %d*sizeof(WCHAR), got %d\n", lstrlenA(expectedsid), size); /* pcchTargetUserSid is exactly the length of szTargetUserSid */ lstrcpyA(patchcode, "apple"); @@ -7792,7 +7792,7 @@ static void test_MsiEnumPatchesEx_usermanaged(LPCSTR usersid, LPCSTR expectedsid ok(!strncmp(targetsid, expectedsid, lstrlenA(expectedsid) - 1), "Expected \"%s\", got \"%s\"\n", expectedsid, targetsid); ok(size == lstrlenA(expectedsid) * sizeof(WCHAR), - "Expected %d, got %d\n", lstrlenA(expectedsid) * sizeof(WCHAR), size); + "Expected %d*sizeof(WCHAR), got %d\n", lstrlenA(expectedsid), size); /* pcchTargetUserSid has enough room for NULL terminator */ lstrcpyA(patchcode, "apple");

1 0

Henri Verbeet : d3d8: Fix some indentation.
by Alexandre Julliard March 26, 2009

March 26, 2009

Module: wine Branch: master Commit: 41ea1e1df756bcdc14ba961e6013accd3193c2a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41ea1e1df756bcdc14ba961e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 10:43:38 2009 +0100 d3d8: Fix some indentation. --- dlls/d3d8/tests/device.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 449348f..aa2b627 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -715,7 +715,7 @@ static void test_states(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 640; - d3dpp.BackBufferHeight = 480; + d3dpp.BackBufferHeight = 480; d3dpp.BackBufferFormat = d3ddm.Format; hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, @@ -808,7 +808,7 @@ static void test_scene(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; @@ -914,7 +914,7 @@ static void test_shader(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; @@ -1111,7 +1111,7 @@ static void test_limits(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; d3dpp.EnableAutoDepthStencil = TRUE; d3dpp.AutoDepthStencilFormat = D3DFMT_D16; @@ -1174,7 +1174,7 @@ static void test_lights(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; d3dpp.EnableAutoDepthStencil = TRUE; d3dpp.AutoDepthStencilFormat = D3DFMT_D16; @@ -1256,7 +1256,7 @@ static void test_render_zero_triangles(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; d3dpp.EnableAutoDepthStencil = TRUE; d3dpp.AutoDepthStencilFormat = D3DFMT_D16;

1 0