June 2006 - Wine-Commits - list.winehq.org

Robert Shearman : libunicode: Add a code page table for the US-ASCII encoding.
by Alexandre Julliard June 8, 2006

June 8, 2006

Module: wine Branch: refs/heads/master Commit: 0d01da1fbf9f9b30ecaa0748ed4378873f1aab4d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0d01da1fbf9f9b30ecaa074… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jun 7 20:12:59 2006 +0100 libunicode: Add a code page table for the US-ASCII encoding. --- libs/unicode/Makefile.in | 1 libs/unicode/c_20127.c | 683 ++++++++++++++++++++++++++++++++++++++++++++++ libs/unicode/cpmap.pl | 1 libs/unicode/cptable.c | 4 4 files changed, 688 insertions(+), 1 deletions(-) create mode 100644 libs/unicode/c_20127.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0d01da1fbf9f9b30eca…

1 0

Robert Shearman : rpcrt4: Implement full-pointer support for interpreted stubs.
by Alexandre Julliard June 8, 2006

June 8, 2006

Module: wine Branch: refs/heads/master Commit: 7ef5c3c7726ceda64a59a88fc28901407185e97d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7ef5c3c7726ceda64a59a88… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jun 7 20:11:36 2006 +0100 rpcrt4: Implement full-pointer support for interpreted stubs. Move the calls to the full pointer init functions before NdrClient/ServerInitializeNew, like in MIDL-generated code. --- dlls/rpcrt4/ndr_stubless.c | 30 ++++++++---------------------- 1 files changed, 8 insertions(+), 22 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 1f1e2e1..0053fa4 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -571,6 +571,10 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_ST pFormat += sizeof(NDR_PROC_HEADER); } + /* create the full pointer translation tables, if requested */ + if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_FULLPTR) + stubMsg.FullPtrXlatTables = NdrFullPointerXlatInit(0,XLAT_CLIENT); + if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) { /* object is always the first argument */ @@ -622,14 +626,6 @@ #endif pFormat += pExtensions->Size; } - /* create the full pointer translation tables, if requested */ - if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_FULLPTR) -#if 0 - stubMsg.FullPtrXlatTables = NdrFullPointerXlatInit(0,XLAT_CLIENT); -#else - FIXME("initialize full pointer translation tables\n"); -#endif - stubMsg.BufferLength = 0; /* store the RPC flags away */ @@ -935,8 +931,6 @@ #endif } } - /* FIXME: unbind the binding handle */ - if (ext_flags.HasNewCorrDesc) { /* free extra correlation package */ @@ -948,11 +942,9 @@ #endif /* NdrPipesDone(...) */ } -#if 0 /* free the full pointer translation tables */ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_FULLPTR) NdrFullPointerXlatFree(stubMsg.FullPtrXlatTables); -#endif /* free marshalling buffer */ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) @@ -1083,6 +1075,10 @@ long WINAPI NdrStubCall2( RpcRaiseException(RPC_X_WRONG_STUB_VERSION); } + /* create the full pointer translation tables, if requested */ + if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_FULLPTR) + stubMsg.FullPtrXlatTables = NdrFullPointerXlatInit(0,XLAT_SERVER); + if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS) { NDR_PROC_HEADER_RPC * pProcHeader = (NDR_PROC_HEADER_RPC *)&pFormat[0]; @@ -1157,14 +1153,6 @@ long WINAPI NdrStubCall2( else NdrServerInitializeNew(pRpcMsg, &stubMsg, pStubDesc); - /* create the full pointer translation tables, if requested */ - if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_FULLPTR) -#if 0 - stubMsg.FullPtrXlatTables = NdrFullPointerXlatInit(0,XLAT_SERVER); -#else - FIXME("initialize full pointer translation tables\n"); -#endif - /* store the RPC flags away */ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS) pRpcMsg->RpcFlags = ((NDR_PROC_HEADER_RPC *)pProcHeader)->rpc_flags; @@ -1505,11 +1493,9 @@ #endif /* NdrPipesDone(...) */ } -#if 0 /* free the full pointer translation tables */ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_FULLPTR) NdrFullPointerXlatFree(stubMsg.FullPtrXlatTables); -#endif /* free server function stack */ HeapFree(GetProcessHeap(), 0, args);

1 0

Robert Shearman : rpcrt4: Implement a process-wide connection pool for client connections,
by Alexandre Julliard June 8, 2006

June 8, 2006

Module: wine Branch: refs/heads/master Commit: 58ec282bfb245991ba439818a320f7650d094ad8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=58ec282bfb245991ba43981… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jun 7 20:12:34 2006 +0100 rpcrt4: Implement a process-wide connection pool for client connections, rather than relying on the restriction of one connection per binding. This also avoids the problem of two threads using the same connection at the same time. --- dlls/rpcrt4/rpc_binding.c | 34 ++++++++++++++++++++------------ dlls/rpcrt4/rpc_binding.h | 6 ++++++ dlls/rpcrt4/rpc_transport.c | 46 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index bb691f6..2e9b40b 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -237,16 +237,15 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding TRACE("(Binding == ^%p)\n", Binding); - /* if we try to bind a new interface and the connection is already opened, - * close the current connection and create a new with the new binding. */ - if (!Binding->server && Binding->FromConn && - (Binding->AuthInfo == Binding->FromConn->AuthInfo) && - memcmp(&Binding->FromConn->ActiveInterface, InterfaceId, - sizeof(RPC_SYNTAX_IDENTIFIER))) { - - TRACE("releasing pre-existing connection\n"); - RPCRT4_DestroyConnection(Binding->FromConn); - Binding->FromConn = NULL; + if (!Binding->server) { + /* try to find a compatible connection from the connection pool */ + NewConnection = RPCRT4_GetIdleConnection(InterfaceId, TransferSyntax, + Binding->Protseq, Binding->NetworkAddr, Binding->Endpoint, + Binding->AuthInfo); + if (NewConnection) { + *Connection = NewConnection; + return RPC_S_OK; + } } else { /* we already have a connection with acceptable binding, so use it */ if (Binding->FromConn) { @@ -307,7 +306,8 @@ RPC_STATUS RPCRT4_OpenBinding(RpcBinding RPCRT4_FreeHeader(response_hdr); } - Binding->FromConn = NewConnection; + if (Binding->server) + Binding->FromConn = NewConnection; *Connection = NewConnection; return RPC_S_OK; @@ -317,8 +317,16 @@ RPC_STATUS RPCRT4_CloseBinding(RpcBindin { TRACE("(Binding == ^%p)\n", Binding); if (!Connection) return RPC_S_OK; - if (Binding->FromConn == Connection) return RPC_S_OK; - return RPCRT4_DestroyConnection(Connection); + if (Binding->server) { + /* don't destroy a connection that is cached in the binding */ + if (Binding->FromConn == Connection) + return RPC_S_OK; + return RPCRT4_DestroyConnection(Connection); + } + else { + RPCRT4_ReleaseIdleConnection(Connection); + return RPC_S_OK; + } } /* utility functions for string composing and parsing */ diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 49f20b0..0723a22 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -23,6 +23,7 @@ #define __WINE_RPC_BINDING_H #include "wine/rpcss_shared.h" #include "security.h" +#include "wine/list.h" typedef struct _RpcAuthInfo @@ -55,6 +56,9 @@ typedef struct _RpcConnection TimeStamp exp; ULONG attr; RpcAuthInfo *AuthInfo; + + /* client-only */ + struct list conn_pool_entry; } RpcConnection; struct protseq_ops { @@ -101,6 +105,8 @@ #define RPCRT4_strdupW(x) RPCRT4_strndup ULONG RpcAuthInfo_AddRef(RpcAuthInfo *AuthInfo); ULONG RpcAuthInfo_Release(RpcAuthInfo *AuthInfo); +RpcConnection *RPCRT4_GetIdleConnection(const RPC_SYNTAX_IDENTIFIER *InterfaceId, const RPC_SYNTAX_IDENTIFIER *TransferSyntax, LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, RpcAuthInfo* AuthInfo); +void RPCRT4_ReleaseIdleConnection(RpcConnection *Connection); RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcBinding* Binding); RPC_STATUS RPCRT4_DestroyConnection(RpcConnection* Connection); RPC_STATUS RPCRT4_OpenConnection(RpcConnection* Connection); diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index b50f839..c9028bb 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -68,6 +68,17 @@ #include "epm_towers.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); +static CRITICAL_SECTION connection_pool_cs; +static CRITICAL_SECTION_DEBUG connection_pool_cs_debug = +{ + 0, 0, &connection_pool_cs, + { &connection_pool_cs_debug.ProcessLocksList, &connection_pool_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": connection_pool") } +}; +static CRITICAL_SECTION connection_pool_cs = { &connection_pool_cs_debug, -1, 0, 0, 0, 0 }; + +static struct list connection_pool = LIST_INIT(connection_pool); + /**** ncacn_np support ****/ typedef struct _RpcConnection_np @@ -777,6 +788,7 @@ RPC_STATUS RPCRT4_CreateConnection(RpcCo NewConnection->NextCallId = 1; if (AuthInfo) RpcAuthInfo_AddRef(AuthInfo); NewConnection->AuthInfo = AuthInfo; + list_init(&NewConnection->conn_pool_entry); TRACE("connection: %p\n", NewConnection); *Connection = NewConnection; @@ -784,6 +796,40 @@ RPC_STATUS RPCRT4_CreateConnection(RpcCo return RPC_S_OK; } +RpcConnection *RPCRT4_GetIdleConnection(const RPC_SYNTAX_IDENTIFIER *InterfaceId, + const RPC_SYNTAX_IDENTIFIER *TransferSyntax, LPCSTR Protseq, LPCSTR NetworkAddr, + LPCSTR Endpoint, RpcAuthInfo* AuthInfo) +{ + RpcConnection *Connection; + /* try to find a compatible connection from the connection pool */ + EnterCriticalSection(&connection_pool_cs); + LIST_FOR_EACH_ENTRY(Connection, &connection_pool, RpcConnection, conn_pool_entry) + if ((Connection->AuthInfo == AuthInfo) && + !memcmp(&Connection->ActiveInterface, InterfaceId, + sizeof(RPC_SYNTAX_IDENTIFIER)) && + !strcmp(rpcrt4_conn_get_name(Connection), Protseq) && + !strcmp(Connection->NetworkAddr, NetworkAddr) && + !strcmp(Connection->Endpoint, Endpoint)) + { + list_remove(&Connection->conn_pool_entry); + LeaveCriticalSection(&connection_pool_cs); + TRACE("got connection from pool %p\n", Connection); + return Connection; + } + + LeaveCriticalSection(&connection_pool_cs); + return NULL; +} + +void RPCRT4_ReleaseIdleConnection(RpcConnection *Connection) +{ + assert(!Connection->server); + EnterCriticalSection(&connection_pool_cs); + list_add_head(&connection_pool, &Connection->conn_pool_entry); + LeaveCriticalSection(&connection_pool_cs); +} + + RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnection* OldConnection) { RPC_STATUS err;

1 0

Robert Shearman : rpcrt4: Fix the retrieval of This for interpreted proxies .
by Alexandre Julliard June 8, 2006

June 8, 2006

Module: wine Branch: refs/heads/master Commit: 1412c47a508d7ed4aacdd47420b4c6f7d2baca77 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1412c47a508d7ed4aacdd47… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jun 7 20:11:46 2006 +0100 rpcrt4: Fix the retrieval of This for interpreted proxies. --- dlls/rpcrt4/ndr_stubless.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 0053fa4..2c93ad5 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -578,7 +578,7 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_ST if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) { /* object is always the first argument */ - This = *(void **)ARG_FROM_OFFSET(stubMsg, 0); + This = **(void ***)(&pFormat+1); NdrProxyInitialize(This, &rpcMsg, &stubMsg, pStubDesc, procedure_number); } else

1 0

H. Verbeet : d3d9: Add a test for GetContainer (Volumes & Surfaces).
by Alexandre Julliard June 7, 2006

June 7, 2006

Module: wine Branch: refs/heads/master Commit: 5eaf49f895a37cc352dcfb18ce6c312a58a745a0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5eaf49f895a37cc352dcfb1… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jun 7 15:13:49 2006 +0200 d3d9: Add a test for GetContainer (Volumes & Surfaces). --- dlls/d3d9/tests/.gitignore | 2 + dlls/d3d9/tests/Makefile.in | 6 +- dlls/d3d9/tests/surface.c | 132 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/volume.c | 132 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 270 insertions(+), 2 deletions(-) create mode 100644 dlls/d3d9/tests/surface.c create mode 100644 dlls/d3d9/tests/volume.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5eaf49f895a37cc352d…

1 0

H. Verbeet : d3d9: Remove unused vshaderdeclaration.c.
by Alexandre Julliard June 7, 2006

June 7, 2006

Module: wine Branch: refs/heads/master Commit: 07a3173beee209ed6f0afb329cb016c35ed57dab URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=07a3173beee209ed6f0afb3… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jun 7 15:13:57 2006 +0200 d3d9: Remove unused vshaderdeclaration.c. --- dlls/d3d9/vshaderdeclaration.c | 74 ---------------------------------------- 1 files changed, 0 insertions(+), 74 deletions(-) delete mode 100644 dlls/d3d9/vshaderdeclaration.c diff --git a/dlls/d3d9/vshaderdeclaration.c b/dlls/d3d9/vshaderdeclaration.c deleted file mode 100644 index 72fcdf2..0000000 --- a/dlls/d3d9/vshaderdeclaration.c +++ /dev/null @@ -1,74 +0,0 @@ -/* - * vertex declaration implementation - * - * Copyright 2002-2003 Raphael Junqueira - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "d3d9_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d9); - -/** - * DirectX9 SDK download - * http://msdn.microsoft.com/library/default.asp?url=/downloads/list/directx.a… - * - * Exploring D3DX - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dndrive/ht… - * - * Using Vertex Shaders - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dndrive/ht… - * - * Dx9 New - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… - * - * Dx9 Shaders - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… - * - * Dx9 D3DX - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… - * - * FVF - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… - * - * NVIDIA: DX8 Vertex Shader to NV Vertex Program - * http://developer.nvidia.com/view.asp?IO=vstovp - * - * NVIDIA: Memory Management with VAR - * http://developer.nvidia.com/view.asp?IO=var_memory_management - */ - -HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(LPDIRECT3DDEVICE9 iface, CONST D3DVERTEXELEMENT9* pVertexElements, IDirect3DVertexDeclaration9** ppDecl) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - FIXME("(%p) : stub\n", This); - return D3D_OK; -} - -HRESULT WINAPI IDirect3DDevice9Impl_SetVertexDeclaration(LPDIRECT3DDEVICE9 iface, IDirect3DVertexDeclaration9* pDecl) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - FIXME("(%p) : stub\n", This); - return D3D_OK; -} - -HRESULT WINAPI IDirect3DDevice9Impl_GetVertexDeclaration(LPDIRECT3DDEVICE9 iface, IDirect3DVertexDeclaration9** ppDecl) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - FIXME("(%p) : stub\n", This); - return D3D_OK; -}

1 0

H. Verbeet : d3d9: Fix QueryInterface.
by Alexandre Julliard June 7, 2006

June 7, 2006

Module: wine Branch: refs/heads/master Commit: 34e2e2bd39e32d27699b962634cfc98cd36340b4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=34e2e2bd39e32d27699b962… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jun 7 15:13:29 2006 +0200 d3d9: Fix QueryInterface. QueryInterface should return S_OK on success and set the object pointer to NULL on failure. This is similar to the patch Ivan submitted a while ago for wined3d. --- dlls/d3d9/basetexture.c | 3 ++- dlls/d3d9/cubetexture.c | 3 ++- dlls/d3d9/device.c | 3 ++- dlls/d3d9/directx.c | 3 ++- dlls/d3d9/indexbuffer.c | 3 ++- dlls/d3d9/pixelshader.c | 3 ++- dlls/d3d9/query.c | 3 ++- dlls/d3d9/resource.c | 3 ++- dlls/d3d9/stateblock.c | 3 ++- dlls/d3d9/surface.c | 3 ++- dlls/d3d9/swapchain.c | 3 ++- dlls/d3d9/texture.c | 3 ++- dlls/d3d9/vertexbuffer.c | 3 ++- dlls/d3d9/vertexdeclaration.c | 3 ++- dlls/d3d9/vertexshader.c | 3 ++- dlls/d3d9/volume.c | 3 ++- dlls/d3d9/volumetexture.c | 3 ++- 17 files changed, 34 insertions(+), 17 deletions(-) diff --git a/dlls/d3d9/basetexture.c b/dlls/d3d9/basetexture.c index 29e6b8b..910862b 100644 --- a/dlls/d3d9/basetexture.c +++ b/dlls/d3d9/basetexture.c @@ -33,10 +33,11 @@ HRESULT WINAPI IDirect3DBaseTexture9Impl || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index 2594147..21464f9 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -35,10 +35,11 @@ HRESULT WINAPI IDirect3DCubeTexture9Impl || IsEqualGUID(riid, &IID_IDirect3DCubeTexture9)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index c6f0527..34973ce 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -34,10 +34,11 @@ HRESULT WINAPI IDirect3DDevice9Impl_Quer || IsEqualGUID(riid, &IID_IDirect3DDevice9)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 808af0a..2c20967 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -33,10 +33,11 @@ HRESULT WINAPI IDirect3D9Impl_QueryInter || IsEqualGUID(riid, &IID_IDirect3D9)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d9/indexbuffer.c b/dlls/d3d9/indexbuffer.c index a780237..a46831e 100644 --- a/dlls/d3d9/indexbuffer.c +++ b/dlls/d3d9/indexbuffer.c @@ -33,10 +33,11 @@ HRESULT WINAPI IDirect3DIndexBuffer9Impl || IsEqualGUID(riid, &IID_IDirect3DIndexBuffer9)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d9/pixelshader.c b/dlls/d3d9/pixelshader.c index fce6590..4be4ca0 100644 --- a/dlls/d3d9/pixelshader.c +++ b/dlls/d3d9/pixelshader.c @@ -32,10 +32,11 @@ HRESULT WINAPI IDirect3DPixelShader9Impl || IsEqualGUID(riid, &IID_IDirect3DPixelShader9)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 0752902..22de219 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -34,10 +34,11 @@ HRESULT WINAPI IDirect3DQuery9Impl_Query || IsEqualGUID(riid, &IID_IDirect3DQuery9)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d9/resource.c b/dlls/d3d9/resource.c index 3ef38d3..d3ac577 100644 --- a/dlls/d3d9/resource.c +++ b/dlls/d3d9/resource.c @@ -32,10 +32,11 @@ HRESULT WINAPI IDirect3DResource9Impl_Qu || IsEqualGUID(riid, &IID_IDirect3DResource9)) { IDirect3DResource9Impl_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index ad87335..8e3aa45 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -33,10 +33,11 @@ HRESULT WINAPI IDirect3DStateBlock9Impl_ || IsEqualGUID(riid, &IID_IDirect3DStateBlock9)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 6fb6daa..f04216e 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -33,10 +33,11 @@ HRESULT WINAPI IDirect3DSurface9Impl_Que || IsEqualGUID(riid, &IID_IDirect3DSurface9)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 95c8096..5bcb480 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -34,10 +34,11 @@ HRESULT WINAPI IDirect3DSwapChain9Impl_Q || IsEqualGUID(riid, &IID_IDirect3DSwapChain9)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 2ec3180..f7eca1d 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -35,10 +35,11 @@ HRESULT WINAPI IDirect3DTexture9Impl_Que || IsEqualGUID(riid, &IID_IDirect3DTexture9)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p) not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index 3fa47df..9567010 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -34,10 +34,11 @@ HRESULT WINAPI IDirect3DVertexBuffer9Imp || IsEqualGUID(riid, &IID_IDirect3DVertexBuffer9)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index f50e34b..c5fb323 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -32,10 +32,11 @@ HRESULT WINAPI IDirect3DVertexDeclaratio || IsEqualGUID(riid, &IID_IDirect3DVertexDeclaration9)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index ed3bc4d..2b74bd6 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -32,10 +32,11 @@ HRESULT WINAPI IDirect3DVertexShader9Imp || IsEqualGUID(riid, &IID_IDirect3DVertexShader9)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index bb1e490..3007c52 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -32,10 +32,11 @@ HRESULT WINAPI IDirect3DVolume9Impl_Quer || IsEqualGUID(riid, &IID_IDirect3DVolume9)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index 5b4d2f8..fe3a1f0 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -34,10 +34,11 @@ HRESULT WINAPI IDirect3DVolumeTexture9Im || IsEqualGUID(riid, &IID_IDirect3DVolumeTexture9)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

H. Verbeet : d3d8: Fix QueryInterface.
by Alexandre Julliard June 7, 2006

June 7, 2006

Module: wine Branch: refs/heads/master Commit: d06aa8d8578f1cf2af1e5170294a194606a2df61 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d06aa8d8578f1cf2af1e517… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jun 7 15:13:29 2006 +0200 d3d8: Fix QueryInterface. QueryInterface should return S_OK on success and set the object pointer to NULL on failure. This is similar to the patch Ivan submitted a while ago for wined3d. --- dlls/d3d8/basetexture.c | 3 ++- dlls/d3d8/cubetexture.c | 3 ++- dlls/d3d8/device.c | 3 ++- dlls/d3d8/directx.c | 3 ++- dlls/d3d8/indexbuffer.c | 3 ++- dlls/d3d8/pixelshader.c | 3 ++- dlls/d3d8/resource.c | 3 ++- dlls/d3d8/stateblock.c | 3 ++- dlls/d3d8/surface.c | 3 ++- dlls/d3d8/swapchain.c | 3 ++- dlls/d3d8/texture.c | 3 ++- dlls/d3d8/vertexbuffer.c | 3 ++- dlls/d3d8/vertexshader.c | 3 ++- dlls/d3d8/volume.c | 3 ++- dlls/d3d8/volumetexture.c | 3 ++- 15 files changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/d3d8/basetexture.c b/dlls/d3d8/basetexture.c index 804e83a..f7e4748 100644 --- a/dlls/d3d8/basetexture.c +++ b/dlls/d3d8/basetexture.c @@ -32,11 +32,12 @@ HRESULT WINAPI IDirect3DBaseTexture8Impl || IsEqualGUID(riid, &IID_IDirect3DBaseTexture8)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 5ad0f7c..763b28c 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -32,10 +32,11 @@ HRESULT WINAPI IDirect3DCubeTexture8Impl || IsEqualGUID(riid, &IID_IDirect3DCubeTexture8)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6ebe678..91872ef 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -45,10 +45,11 @@ HRESULT WINAPI IDirect3DDevice8Impl_Quer || IsEqualGUID(riid, &IID_IDirect3DDevice8)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 47611bf..4ba8a2f 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -46,10 +46,11 @@ HRESULT WINAPI IDirect3D8Impl_QueryInter || IsEqualGUID(riid, &IID_IDirect3D8)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid),ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d8/indexbuffer.c b/dlls/d3d8/indexbuffer.c index a83e72a..1df5d88 100644 --- a/dlls/d3d8/indexbuffer.c +++ b/dlls/d3d8/indexbuffer.c @@ -32,10 +32,11 @@ HRESULT WINAPI IDirect3DIndexBuffer8Impl || IsEqualGUID(riid, &IID_IDirect3DIndexBuffer8)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d8/pixelshader.c b/dlls/d3d8/pixelshader.c index 968eda1..9ebb9dd 100644 --- a/dlls/d3d8/pixelshader.c +++ b/dlls/d3d8/pixelshader.c @@ -32,10 +32,11 @@ HRESULT WINAPI IDirect3DPixelShader8Impl || IsEqualGUID(riid, &IID_IDirect3DPixelShader8)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d8/resource.c b/dlls/d3d8/resource.c index 3e395fb..5bde093 100644 --- a/dlls/d3d8/resource.c +++ b/dlls/d3d8/resource.c @@ -31,10 +31,11 @@ HRESULT WINAPI IDirect3DResource8Impl_Qu || IsEqualGUID(riid, &IID_IDirect3DResource8)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d8/stateblock.c b/dlls/d3d8/stateblock.c index b1634d5..320810b 100644 --- a/dlls/d3d8/stateblock.c +++ b/dlls/d3d8/stateblock.c @@ -34,10 +34,11 @@ HRESULT WINAPI IDirect3DStateBlock8Impl_ || IsEqualGUID(riid, &IID_IDirect3DStateBlock8)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 4c589d7..8fe7eea 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -32,10 +32,11 @@ HRESULT WINAPI IDirect3DSurface8Impl_Que || IsEqualGUID(riid, &IID_IDirect3DSurface8)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index dcba111..6c9913f 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -32,10 +32,11 @@ HRESULT WINAPI IDirect3DSwapChain8Impl_Q || IsEqualGUID(riid, &IID_IDirect3DSwapChain8)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index be52192..d01867f 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -33,10 +33,11 @@ HRESULT WINAPI IDirect3DTexture8Impl_Que || IsEqualGUID(riid, &IID_IDirect3DTexture8)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p) not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d8/vertexbuffer.c b/dlls/d3d8/vertexbuffer.c index 36691bc..402514b 100644 --- a/dlls/d3d8/vertexbuffer.c +++ b/dlls/d3d8/vertexbuffer.c @@ -32,11 +32,12 @@ HRESULT WINAPI IDirect3DVertexBuffer8Imp || IsEqualGUID(riid, &IID_IDirect3DVertexBuffer8)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d8/vertexshader.c b/dlls/d3d8/vertexshader.c index bf88998..b1fb6a1 100644 --- a/dlls/d3d8/vertexshader.c +++ b/dlls/d3d8/vertexshader.c @@ -32,10 +32,11 @@ HRESULT WINAPI IDirect3DVertexShader8Imp || IsEqualGUID(riid, &IID_IDirect3DVertexShader8)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index b96e802..f6e6473 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -31,10 +31,11 @@ HRESULT WINAPI IDirect3DVolume8Impl_Quer || IsEqualGUID(riid, &IID_IDirect3DVolume8)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index c68bfa3..04297f4 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -33,10 +33,11 @@ HRESULT WINAPI IDirect3DVolumeTexture8Im || IsEqualGUID(riid, &IID_IDirect3DVolumeTexture8)) { IUnknown_AddRef(iface); *ppobj = This; - return D3D_OK; + return S_OK; } WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Andrew Talbot : msvcrt: Write-strings warning fix.
by Alexandre Julliard June 7, 2006

June 7, 2006

Module: wine Branch: refs/heads/master Commit: 034fc473ecac9ec489ccf0a8e406121cfdc393c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=034fc473ecac9ec489ccf0a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jun 3 15:33:17 2006 +0100 msvcrt: Write-strings warning fix. --- dlls/msvcrt/undname.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index cc49f48..b7101c0 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1022,6 +1022,7 @@ static BOOL symbol_demangle(struct parse { BOOL ret = FALSE; unsigned do_after = 0; + static CHAR dashed_null[] = "--null--"; /* FIXME seems wrong as name, as it demangles a simple data type */ if (sym->flags & UNDNAME_NO_ARGUMENTS) @@ -1135,7 +1136,7 @@ static BOOL symbol_demangle(struct parse { case 1: case 2: sym->stack.num = sym->stack.max = 1; - sym->stack.elts[0] = "--null--"; + sym->stack.elts[0] = dashed_null; break; case 4: sym->result = (char*)function_name;

1 0

Andrew Talbot : crypt32: Write-strings warning fix.
by Alexandre Julliard June 7, 2006

June 7, 2006

Module: wine Branch: refs/heads/master Commit: 63efd7f8e62fb6301c736930c5a68186846c3828 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=63efd7f8e62fb6301c73693… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jun 1 20:54:11 2006 +0100 crypt32: Write-strings warning fix. --- dlls/crypt32/encode.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 3fee0c9..cd8b997 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -2400,13 +2400,14 @@ static BOOL WINAPI CRYPT_ExportRsaPublic { BOOL ret; HCRYPTKEY key; + static CHAR oid[] = szOID_RSA_RSA; TRACE("(%ld, %ld, %08lx, %s, %08lx, %p, %p, %p)\n", hCryptProv, dwKeySpec, dwCertEncodingType, debugstr_a(pszPublicKeyObjId), dwFlags, pvAuxInfo, pInfo, pcbInfo); if (!pszPublicKeyObjId) - pszPublicKeyObjId = szOID_RSA_RSA; + pszPublicKeyObjId = oid; if ((ret = CryptGetUserKey(hCryptProv, dwKeySpec, &key))) { DWORD keySize = 0;

1 0